diff options
Diffstat (limited to 'drivers/bluetooth/bt3c_cs.c')
| -rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 2cbe70b66470..b3e4d07a4ac2 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
| @@ -343,6 +343,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) | |||
| 343 | bt3c_info_t *info = dev_inst; | 343 | bt3c_info_t *info = dev_inst; |
| 344 | unsigned int iobase; | 344 | unsigned int iobase; |
| 345 | int iir; | 345 | int iir; |
| 346 | irqreturn_t r = IRQ_NONE; | ||
| 346 | 347 | ||
| 347 | BUG_ON(!info->hdev); | 348 | BUG_ON(!info->hdev); |
| 348 | 349 | ||
| @@ -374,11 +375,12 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) | |||
| 374 | 375 | ||
| 375 | outb(iir, iobase + CONTROL); | 376 | outb(iir, iobase + CONTROL); |
| 376 | } | 377 | } |
| 378 | r = IRQ_HANDLED; | ||
| 377 | } | 379 | } |
| 378 | 380 | ||
| 379 | spin_unlock(&(info->lock)); | 381 | spin_unlock(&(info->lock)); |
| 380 | 382 | ||
| 381 | return IRQ_HANDLED; | 383 | return r; |
| 382 | } | 384 | } |
| 383 | 385 | ||
| 384 | 386 | ||
| @@ -657,7 +659,7 @@ static int bt3c_probe(struct pcmcia_device *link) | |||
| 657 | 659 | ||
| 658 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 660 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
| 659 | link->io.NumPorts1 = 8; | 661 | link->io.NumPorts1 = 8; |
| 660 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; | 662 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; |
| 661 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 663 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; |
| 662 | 664 | ||
| 663 | link->irq.Handler = bt3c_interrupt; | 665 | link->irq.Handler = bt3c_interrupt; |
