summaryrefslogtreecommitdiff
path: root/drivers/uio
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-10-29 18:35:52 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 10:44:43 -0800
commite543ae896626a54c0c05e3c434312d6d033d450c (patch)
tree2bb381ab3822c9202e2fef60c02be3ba7f754726 /drivers/uio
parent7898aa5c39d159684dad15bab1150b8e77c7aed6 (diff)
downloadlinux-3.10-e543ae896626a54c0c05e3c434312d6d033d450c.tar.gz
linux-3.10-e543ae896626a54c0c05e3c434312d6d033d450c.tar.bz2
linux-3.10-e543ae896626a54c0c05e3c434312d6d033d450c.zip
UIO: uio_pdrv_genirq: allow custom irq_flags
I can't think of a reason why the driver prevents people from setting any custom bits in their platform device, but I can think of some reasons for allowing custom flags. Like setting the IRQF_TRIGGER_... bits. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Hans J. Koch <hjk@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/uio')
-rw-r--r--drivers/uio/uio_pdrv_genirq.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 1f82c83a92a..3f06818cf9f 100644
--- 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;