UIO: uio_pdrv_genirq: allow custom irq_flags

[linux-2.6-omap-h63xx.git] / drivers / uio / uio_pdrv_genirq.c

diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 1f82c83a92aeb64aebc61071427fb80b4f4c3e32..3f06818cf9fa3dc1628f794ec80fc2c2e22d88eb 100644 (file)
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -81,7 +81,8 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
                goto bad0;
        }
 
-       if (uioinfo->handler || uioinfo->irqcontrol || uioinfo->irq_flags) {
+       if (uioinfo->handler || uioinfo->irqcontrol ||
+           uioinfo->irq_flags & IRQF_SHARED) {
                dev_err(&pdev->dev, "interrupt configuration error\n");
                goto bad0;
        }
@@ -132,7 +133,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
         * Interrupt sharing is not supported.
         */
 
-       uioinfo->irq_flags = IRQF_DISABLED;
+       uioinfo->irq_flags |= IRQF_DISABLED;
        uioinfo->handler = uio_pdrv_genirq_handler;
        uioinfo->irqcontrol = uio_pdrv_genirq_irqcontrol;
        uioinfo->priv = priv;