summaryrefslogtreecommitdiffstats
path: root/drivers/atm/he.c
diff options
context:
space:
mode:
authorchas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>2010-07-10 05:42:02 +0200
committerDavid S. Miller <davem@davemloft.net>2010-07-13 05:21:48 +0200
commit06df277a670263a073362046855851aad278d988 (patch)
tree9945871b332fb854c59a46c7e8dca29d69683de2 /drivers/atm/he.c
parentfec: use interrupt for MDIO completion indication (diff)
downloadlinux-06df277a670263a073362046855851aad278d988.tar.xz
linux-06df277a670263a073362046855851aad278d988.zip
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.c3
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)
he_writel(he_dev, 0x0, GRP_54_MAP);
he_writel(he_dev, 0x0, GRP_76_MAP);
- if (request_irq(he_dev->pci_dev->irq, he_irq_handler, IRQF_DISABLED|IRQF_SHARED, DEV_LABEL, he_dev)) {
+ if (request_irq(he_dev->pci_dev->irq,
+ he_irq_handler, IRQF_SHARED, DEV_LABEL, he_dev)) {
hprintk("irq %d already in use\n", he_dev->pci_dev->irq);
return -EINVAL;
}