Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: pd6729: Fix error path
pcmcia: preserve configuration information if request_io fails partly
+7
-1
+6
drivers/pcmcia/pcmcia_resource.c
+6
drivers/pcmcia/pcmcia_resource.c
···
595
595
if (c->io[1].end) {
596
596
ret = alloc_io_space(s, &c->io[1], p_dev->io_lines);
597
597
if (ret) {
598
+
struct resource tmp = c->io[0];
599
+
/* release the previously allocated resource */
598
600
release_io_space(s, &c->io[0]);
601
+
/* but preserve the settings, for they worked... */
602
+
c->io[0].end = resource_size(&tmp);
603
+
c->io[0].start = tmp.start;
604
+
c->io[0].flags = tmp.flags;
599
605
goto out;
600
606
}
601
607
} else
+1
-1
drivers/pcmcia/pd6729.c
+1
-1
drivers/pcmcia/pd6729.c