diff options
| author | David S. Miller <[email protected]> | 2010-02-01 07:34:58 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2010-02-01 07:34:58 +0000 |
| commit | 1e98cadb0d2b9f945f35beee4a0ce667f3c6dbe4 (patch) | |
| tree | 0b5940be30331d461cd4421abe7829b392ab6e62 /drivers/bluetooth/bluecard_cs.c | |
| parent | cdc_ether: Partially revert "usbnet: Set link down initially ..." (diff) | |
| parent | Bluetooth: Use the control channel for raw HID reports (diff) | |
| download | kernel-1e98cadb0d2b9f945f35beee4a0ce667f3c6dbe4.tar.gz kernel-1e98cadb0d2b9f945f35beee4a0ce667f3c6dbe4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'drivers/bluetooth/bluecard_cs.c')
| -rw-r--r-- | drivers/bluetooth/bluecard_cs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 2acdc605cb4b..c2cf81144715 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c @@ -503,7 +503,9 @@ static irqreturn_t bluecard_interrupt(int irq, void *dev_inst) unsigned int iobase; unsigned char reg; - BUG_ON(!info->hdev); + if (!info || !info->hdev) + /* our irq handler is shared */ + return IRQ_NONE; if (!test_bit(CARD_READY, &(info->hw_state))) return IRQ_HANDLED; |