diff options
Diffstat (limited to 'drivers/char/isicom.c')
-rw-r--r-- | drivers/char/isicom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 478bf4d7d065..913be23e0a24 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c | |||
@@ -245,7 +245,7 @@ static int lock_card(struct isi_board *card) | |||
245 | printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", | 245 | printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", |
246 | card->base); | 246 | card->base); |
247 | 247 | ||
248 | return 0; /* Failed to aquire the card! */ | 248 | return 0; /* Failed to acquire the card! */ |
249 | } | 249 | } |
250 | 250 | ||
251 | static int lock_card_at_interrupt(struct isi_board *card) | 251 | static int lock_card_at_interrupt(struct isi_board *card) |
@@ -262,7 +262,7 @@ static int lock_card_at_interrupt(struct isi_board *card) | |||
262 | spin_unlock_irqrestore(&card->card_lock, card->flags); | 262 | spin_unlock_irqrestore(&card->card_lock, card->flags); |
263 | } | 263 | } |
264 | /* Failing in interrupt is an acceptable event */ | 264 | /* Failing in interrupt is an acceptable event */ |
265 | return 0; /* Failed to aquire the card! */ | 265 | return 0; /* Failed to acquire the card! */ |
266 | } | 266 | } |
267 | 267 | ||
268 | static void unlock_card(struct isi_board *card) | 268 | static void unlock_card(struct isi_board *card) |
@@ -1614,14 +1614,14 @@ static int __devinit isicom_register_isr(struct pci_dev *pdev, | |||
1614 | const unsigned int index) | 1614 | const unsigned int index) |
1615 | { | 1615 | { |
1616 | struct isi_board *board = pci_get_drvdata(pdev); | 1616 | struct isi_board *board = pci_get_drvdata(pdev); |
1617 | unsigned long irqflags = SA_INTERRUPT; | 1617 | unsigned long irqflags = IRQF_DISABLED; |
1618 | int retval = -EINVAL; | 1618 | int retval = -EINVAL; |
1619 | 1619 | ||
1620 | if (!board->base) | 1620 | if (!board->base) |
1621 | goto end; | 1621 | goto end; |
1622 | 1622 | ||
1623 | if (board->isa == NO) | 1623 | if (board->isa == NO) |
1624 | irqflags |= SA_SHIRQ; | 1624 | irqflags |= IRQF_SHARED; |
1625 | 1625 | ||
1626 | retval = request_irq(board->irq, isicom_interrupt, irqflags, | 1626 | retval = request_irq(board->irq, isicom_interrupt, irqflags, |
1627 | ISICOM_NAME, board); | 1627 | ISICOM_NAME, board); |