[PATCH] handle errors returned by platform_get_irq*()

platform_get_irq*() now returns on -ENXIO when the resource cannot be
found.  Ensure all users of platform_get_irq*() handle this error
appropriately.

Signed-off-by: David Vrabel <dvrabel@arcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

17 files changed, 56 insertions, 10 deletions

diff --git a/drivers/char/s3c2410-rtc.c b/drivers/char/s3c2410-rtc.c
index 2e308657f6f6..b0038b19b505 100644
--- a/drivers/char/s3c2410-rtc.c
+++ b/drivers/char/s3c2410-rtc.c
@@ -448,13 +448,13 @@ static int s3c2410_rtc_probe(struct platform_device *pdev)
         /* find the IRQs */
 
         s3c2410_rtc_tickno = platform_get_irq(pdev, 1);
-        if (s3c2410_rtc_tickno <= 0) {
+        if (s3c2410_rtc_tickno < 0) {
                 dev_err(&pdev->dev, "no irq for rtc tick\n");
                 return -ENOENT;
         }
 
         s3c2410_rtc_alarmno = platform_get_irq(pdev, 0);
-        if (s3c2410_rtc_alarmno <= 0) {
+        if (s3c2410_rtc_alarmno < 0) {
                 dev_err(&pdev->dev, "no irq for alarm\n");
                 return -ENOENT;
         }
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index b4d843489881..2c2c51773200 100644
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -338,6 +338,10 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
 
         wdt->dev = &dev->dev;
         wdt->irq = platform_get_irq(dev, 0);
+        if (wdt->irq < 0) {
+                ret = -ENXIO;
+                goto err_free;
+        }
         wdt->base = ioremap(res->start, res->end - res->start + 1);
         if (!wdt->base) {
                 ret = -ENOMEM;
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index 1414851a17b8..d00a02fc23e4 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -434,7 +434,7 @@ static int
 iop3xx_i2c_probe(struct platform_device *pdev)
 {
         struct resource *res;
-        int ret;
+        int ret, irq;
         struct i2c_adapter *new_adapter;
         struct i2c_algo_iop3xx_data *adapter_data;
 
@@ -470,7 +470,12 @@ iop3xx_i2c_probe(struct platform_device *pdev)
                 goto release_region;
         }
 
-        ret = request_irq(platform_get_irq(pdev, 0), iop3xx_i2c_irq_handler, 0,
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                ret = -ENXIO;
+                goto unmap;
+        }
+        ret = request_irq(irq, iop3xx_i2c_irq_handler, 0,
                                 pdev->name, adapter_data);
 
         if (ret) {
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 5ccd338a9dc9..2721e4c8184a 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -302,6 +302,10 @@ static int fsl_i2c_probe(struct platform_device *pdev)
         }
 
         i2c->irq = platform_get_irq(pdev, 0);
+        if (i2c->irq < 0) {
+                result = -ENXIO;
+                goto fail_get_irq;
+        }
         i2c->flags = pdata->device_flags;
         init_waitqueue_head(&i2c->queue);
 
@@ -340,6 +344,7 @@ static int fsl_i2c_probe(struct platform_device *pdev)
       fail_irq:
         iounmap(i2c->base);
       fail_map:
+      fail_get_irq:
         kfree(i2c);
         return result;
 };
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 22781d84f79f..ac5cde1bbd2b 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -516,6 +516,10 @@ mv64xxx_i2c_probe(struct platform_device *pd)
         drv_data->freq_m = pdata->freq_m;
         drv_data->freq_n = pdata->freq_n;
         drv_data->irq = platform_get_irq(pd, 0);
+        if (drv_data->irq < 0) {
+                rc = -ENXIO;
+                goto exit_unmap_regs;
+        }
         drv_data->adapter.id = I2C_HW_MV64XXX;
         drv_data->adapter.algo = &mv64xxx_i2c_algo;
         drv_data->adapter.owner = THIS_MODULE;
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 32431dcf5d8e..71f27e955d87 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -674,6 +674,11 @@ static int au_ide_probe(struct device *dev)
                 ret = -ENODEV;
                 goto out;
         }
+        if (ahwif->irq < 0) {
+                pr_debug("%s %d: no IRQ\n", DRV_NAME, pdev->id);
+                ret = -ENODEV;
+                goto out;
+        }
 
         if (!request_mem_region (res->start, res->end-res->start, pdev->name)) {
                 pr_debug("%s: request_mem_region failed\n", DRV_NAME);
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index 285d7d068097..c32fad1ce51c 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -438,7 +438,7 @@ static int pxamci_probe(struct platform_device *pdev)
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         irq = platform_get_irq(pdev, 0);
-        if (!r || irq == NO_IRQ)
+        if (!r || irq < 0)
                 return -ENXIO;
 
         r = request_mem_region(r->start, SZ_4K, DRIVER_NAME);
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index 53e3afc1b7b7..09d5c3f26985 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -696,7 +696,9 @@ static int __init am79c961_probe(struct platform_device *pdev)
         dev->base_addr = res->start;
         dev->irq = platform_get_irq(pdev, 0);
 
-        ret = -ENODEV;
+        ret = -ENODEV;
+        if (dev->irq < 0)
+                goto nodev;
         if (!request_region(dev->base_addr, 0x18, dev->name))
                 goto nodev;
 
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index e67b1d06611c..95e2bb8dd7b4 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -118,6 +118,8 @@ static int do_pd_setup(struct fs_enet_private *fep)
 
         /* Fill out IRQ field */
         fep->interrupt = platform_get_irq(pdev, 0);
+        if (fep->interrupt < 0)
+                return -EINVAL;
 
         /* Attach the memory for the FCC Parameter RAM */
         r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fcc_pram");
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index 2e8f44469699..3dad69dfdb2c 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -144,6 +144,8 @@ static int do_pd_setup(struct fs_enet_private *fep)
         
         /* Fill out IRQ field */
         fep->interrupt = platform_get_irq_byname(pdev,"interrupt");
+        if (fep->interrupt < 0)
+                return -EINVAL;
         
         r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
         fep->fec.fecp =(void*)r->start;
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index a3897fda71fa..a772b286f96d 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -118,6 +118,8 @@ static int do_pd_setup(struct fs_enet_private *fep)
 
         /* Fill out IRQ field */
         fep->interrupt = platform_get_irq_byname(pdev, "interrupt");
+        if (fep->interrupt < 0)
+                return -EINVAL;
 
         r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
         fep->scc.sccp = (void *)r->start;
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 0e8e3fcde9ff..771e25d8c417 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -193,8 +193,12 @@ static int gfar_probe(struct platform_device *pdev)
                 priv->interruptTransmit = platform_get_irq_byname(pdev, "tx");
                 priv->interruptReceive = platform_get_irq_byname(pdev, "rx");
                 priv->interruptError = platform_get_irq_byname(pdev, "error");
+                if (priv->interruptTransmit < 0 || priv->interruptReceive < 0 || priv->interruptError < 0)
+                        goto regs_fail;
         } else {
                 priv->interruptTransmit = platform_get_irq(pdev, 0);
+                if (priv->interruptTransmit < 0)
+                        goto regs_fail;
         }
 
         /* get a pointer to the register memory */
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 7ec08127c9d6..75e9b3b910cc 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2221,6 +2221,10 @@ static int smc_drv_probe(struct platform_device *pdev)
 
         ndev->dma = (unsigned char)-1;
         ndev->irq = platform_get_irq(pdev, 0);
+        if (ndev->irq < 0) {
+                ret = -ENODEV;
+                goto out_free_netdev;
+        }
 
         ret = smc_request_attrib(pdev);
         if (ret)
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 47b5ade95bde..2c23d7584399 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -218,7 +218,7 @@ static int __init omap_cf_probe(struct device *dev)
 
         /* either CFLASH.IREQ (INT_1610_CF) or some GPIO */
         irq = platform_get_irq(pdev, 0);
-        if (!irq)
+        if (irq < 0)
                 return -EINVAL;
 
         cf = kcalloc(1, sizeof *cf, GFP_KERNEL);
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 7410e093a6b9..00d7c0ad8cbf 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1066,6 +1066,8 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
         port->mapbase   = res->start;
         port->membase   = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART);
         port->irq       = platform_get_irq(platdev, 0);
+        if (port->irq < 0)
+                port->irq = 0;
 
         ourport->clk    = clk_get(&platdev->dev, "uart");
 
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 3785b3f7df1b..ca19abe01c53 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -286,7 +286,7 @@ void usb_hcd_omap_remove (struct usb_hcd *, struct platform_device *);
 int usb_hcd_omap_probe (const struct hc_driver *driver,
                           struct platform_device *pdev)
 {
-        int retval;
+        int retval, irq;
         struct usb_hcd *hcd = 0;
         struct ohci_hcd *ohci;
 
@@ -329,7 +329,12 @@ int usb_hcd_omap_probe (const struct hc_driver *driver,
         if (retval < 0)
                 goto err2;
 
-        retval = usb_add_hcd(hcd, platform_get_irq(pdev, 0), SA_INTERRUPT);
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                retval = -ENXIO;
+                goto err2;
+        }
+        retval = usb_add_hcd(hcd, irq, SA_INTERRUPT);
         if (retval == 0)
                 return retval;
 
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 8a893ce7040d..d9831fd42341 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1457,7 +1457,7 @@ static int __init sa1100fb_probe(struct platform_device *pdev)
         int ret, irq;
 
         irq = platform_get_irq(pdev, 0);
-        if (irq <= 0)
+        if (irq < 0)
                 return -EINVAL;
 
         if (!request_mem_region(0xb0100000, 0x10000, "LCD"))