diff options
| author | Arvind Yadav <arvind.yadav.cs@gmail.com> | 2017-01-18 13:41:31 +0530 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2017-02-25 22:21:21 +0100 |
| commit | af640d17ecee1f82a949b580cc4a3e8f29c377b9 (patch) | |
| tree | c2426ff1e8ea21131e3ed627df62d1ded2097a11 /drivers/parisc | |
| parent | 99cde44edfa06b5f910c1704cb15d36310a56545 (diff) | |
| download | linux-af640d17ecee1f82a949b580cc4a3e8f29c377b9.tar.gz linux-af640d17ecee1f82a949b580cc4a3e8f29c377b9.tar.bz2 linux-af640d17ecee1f82a949b580cc4a3e8f29c377b9.zip | |
parisc: eisa: Fix resource leaks in error paths
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'drivers/parisc')
| -rw-r--r-- | drivers/parisc/eisa.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c index 59edee911f7d..7e2f6d5a6aaf 100644 --- a/drivers/parisc/eisa.c +++ b/drivers/parisc/eisa.c @@ -334,7 +334,7 @@ static int __init eisa_probe(struct parisc_device *dev) result = request_irq(dev->irq, eisa_irq, IRQF_SHARED, "EISA", &eisa_dev); if (result) { printk(KERN_ERR "EISA: request_irq failed!\n"); - return result; + goto error_release; } /* Reserve IRQ2 */ @@ -358,6 +358,11 @@ static int __init eisa_probe(struct parisc_device *dev) } } eisa_eeprom_addr = ioremap_nocache(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH); + if (!eisa_eeprom_addr) { + result = -ENOMEM; + printk(KERN_ERR "EISA: ioremap_nocache failed!\n"); + goto error_free_irq; + } result = eisa_enumerator(eisa_dev.eeprom_addr, &eisa_dev.hba.io_space, &eisa_dev.hba.lmmio_space); init_eisa_pic(); @@ -372,11 +377,20 @@ static int __init eisa_probe(struct parisc_device *dev) eisa_dev.root.dma_mask = 0xffffffff; /* wild guess */ if (eisa_root_register (&eisa_dev.root)) { printk(KERN_ERR "EISA: Failed to register EISA root\n"); - return -1; + result = -ENOMEM; + goto error_iounmap; } } return 0; + +error_iounmap: + iounmap(eisa_eeprom_addr); +error_free_irq: + free_irq(dev->irq, &eisa_dev); +error_release: + release_resource(&eisa_dev.hba.io_space); + return result; } static const struct parisc_device_id eisa_tbl[] = { |