aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm/nicstar.c
diff options
context:
space:
mode:
authorchas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>2010-07-10 03:42:02 +0000
committerDavid S. Miller <davem@davemloft.net>2010-07-12 20:21:48 -0700
commit06df277a670263a073362046855851aad278d988 (patch)
tree9945871b332fb854c59a46c7e8dca29d69683de2 /drivers/atm/nicstar.c
parentfec: use interrupt for MDIO completion indication (diff)
downloadlinux-dev-06df277a670263a073362046855851aad278d988.tar.xz
linux-dev-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/nicstar.c')
-rw-r--r--drivers/atm/nicstar.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 59876c66a92a..cff337ef85fd 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -765,8 +765,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
card->intcnt = 0;
if (request_irq
- (pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED,
- "nicstar", card) != 0) {
+ (pcidev->irq, &ns_irq_handler, IRQF_SHARED, "nicstar", card) != 0) {
printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
error = 9;
ns_init_card_error(card, error);