diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-27 12:26:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-27 12:26:33 -0700 |
| commit | 9a457a524762edc1bb1ded65b7a75c01738632d5 (patch) | |
| tree | 19b8b7584abd26f1b3d2390fd5523af0182fad42 | |
| parent | bc5fbd9cc8b72ea591557c1277237a43c65ce775 (diff) | |
| parent | 40d24ff9b4309d37999bc0ae91a271f57651d9dd (diff) | |
| download | linux-3.10-9a457a524762edc1bb1ded65b7a75c01738632d5.tar.gz linux-3.10-9a457a524762edc1bb1ded65b7a75c01738632d5.tar.bz2 linux-3.10-9a457a524762edc1bb1ded65b7a75c01738632d5.zip | |
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
| -rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 6 | ||||
| -rw-r--r-- | drivers/pcmcia/pd6729.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index a5c176598d9..9ba4dade69a 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c @@ -595,7 +595,13 @@ int pcmcia_request_io(struct pcmcia_device *p_dev) if (c->io[1].end) { ret = alloc_io_space(s, &c->io[1], p_dev->io_lines); if (ret) { + struct resource tmp = c->io[0]; + /* release the previously allocated resource */ 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; } } else diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index b8a869af0f4..deef6656ab7 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c @@ -646,7 +646,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, if (!pci_resource_start(dev, 0)) { dev_warn(&dev->dev, "refusing to load the driver as the " "io_base is NULL.\n"); - goto err_out_free_mem; + goto err_out_disable; } dev_info(&dev->dev, "Cirrus PD6729 PCI to PCMCIA Bridge at 0x%llx " |