diff options
author | chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil> | 2010-07-09 23:42:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-12 23:21:48 -0400 |
commit | 06df277a670263a073362046855851aad278d988 (patch) | |
tree | 9945871b332fb854c59a46c7e8dca29d69683de2 /drivers/atm/he.c | |
parent | 97b72e4320a9aaa4a7f1592ee7d2da7e2c9bd349 (diff) |
atm: remove IRQF_DISABLED in combination with IRQF_SHARED
Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm/he.c')
-rw-r--r-- | drivers/atm/he.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index ea9cbe596a28..fa4d600fd6f7 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c | |||
@@ -967,7 +967,8 @@ he_init_irq(struct he_dev *he_dev) | |||
967 | he_writel(he_dev, 0x0, GRP_54_MAP); | 967 | he_writel(he_dev, 0x0, GRP_54_MAP); |
968 | he_writel(he_dev, 0x0, GRP_76_MAP); | 968 | he_writel(he_dev, 0x0, GRP_76_MAP); |
969 | 969 | ||
970 | if (request_irq(he_dev->pci_dev->irq, he_irq_handler, IRQF_DISABLED|IRQF_SHARED, DEV_LABEL, he_dev)) { | 970 | if (request_irq(he_dev->pci_dev->irq, |
971 | he_irq_handler, IRQF_SHARED, DEV_LABEL, he_dev)) { | ||
971 | hprintk("irq %d already in use\n", he_dev->pci_dev->irq); | 972 | hprintk("irq %d already in use\n", he_dev->pci_dev->irq); |
972 | return -EINVAL; | 973 | return -EINVAL; |
973 | } | 974 | } |