projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e99b99b)
can: sja1000: allow shared interrupt definition
authorYegor Yefremov <yegor_sub1@visionsystems.de>
Fri, 19 Mar 2010 00:49:08 +0000 (00:49 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Mar 2010 03:33:37 +0000 (20:33 -0700)
extend the AND mask, so that IRQF_SHARED flag remains

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/can/sja1000/sja1000_platform.c patch | blob | blame | history

diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c
index 628374c2a05f728b7d05f25d016e12ba7312e8c3..bec0d3d99fe30e3ee0c71b3c38d290589e3372ec 100644 (file)
--- a/drivers/net/can/sja1000/sja1000_platform.c
+++ b/drivers/net/can/sja1000/sja1000_platform.c
@@ -90,7 +90,7 @@ static int sp_probe(struct platform_device *pdev)
        priv = netdev_priv(dev);
 
        dev->irq = res_irq->start;
-       priv->irq_flags = res_irq->flags & IRQF_TRIGGER_MASK;
+       priv->irq_flags = res_irq->flags & (IRQF_TRIGGER_MASK | IRQF_SHARED);
        priv->reg_base = addr;
        priv->read_reg = sp_read_reg;
        priv->write_reg = sp_write_reg;