瀏覽代碼

pcmcia: preserve configuration information if request_io fails partly

If pcmcia_request_io() only fails partly -- for the second of two
requested resources -- preserve the configuration settings for the
first one.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Dominik Brodowski 14 年之前
父節點
當前提交
7cdffc8652
共有 1 個文件被更改,包括 6 次插入0 次删除
  1. 6 0
      drivers/pcmcia/pcmcia_resource.c

+ 6 - 0
drivers/pcmcia/pcmcia_resource.c

@@ -595,7 +595,13 @@ int pcmcia_request_io(struct pcmcia_device *p_dev)
 	if (c->io[1].end) {
 	if (c->io[1].end) {
 		ret = alloc_io_space(s, &c->io[1], p_dev->io_lines);
 		ret = alloc_io_space(s, &c->io[1], p_dev->io_lines);
 		if (ret) {
 		if (ret) {
+			struct resource tmp = c->io[0];
+			/* release the previously allocated resource */
 			release_io_space(s, &c->io[0]);
 			release_io_space(s, &c->io[0]);
+			/* but preserve the settings, for they worked... */
+			c->io[0].end = resource_size(&tmp);
+			c->io[0].start = tmp.start;
+			c->io[0].flags = tmp.flags;
 			goto out;
 			goto out;
 		}
 		}
 	} else
 	} else