linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / pcmcia / omap_cf.c

diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 420e10a..47b5ade 100644 (file)
--- 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 < 0)
+       if (!irq)
                return -EINVAL;
 
        cf = kcalloc(1, sizeof *cf, GFP_KERNEL);
@@ -232,7 +232,7 @@ static int __init omap_cf_probe(struct device *dev)
        dev_set_drvdata(dev, cf);
 
        /* this primarily just shuts up irq handling noise */
-       status = request_irq(irq, omap_cf_irq, IRQF_SHARED,
+       status = request_irq(irq, omap_cf_irq, SA_SHIRQ,
                        driver_name, cf);
        if (status < 0)
                goto fail0;