diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-01 02:34:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-01 02:34:58 -0500 |
| commit | 1e98cadb0d2b9f945f35beee4a0ce667f3c6dbe4 (patch) | |
| tree | 0b5940be30331d461cd4421abe7829b392ab6e62 /drivers/bluetooth/bluecard_cs.c | |
| parent | 71cc1fa9f2d71eb2eba9b8e71e27cff9863e55f3 (diff) | |
| parent | 6bf8268f9a91f1065c99503161ebd061492bebe3 (diff) | |
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) | |||
| 503 | unsigned int iobase; | 503 | unsigned int iobase; |
| 504 | unsigned char reg; | 504 | unsigned char reg; |
| 505 | 505 | ||
| 506 | BUG_ON(!info->hdev); | 506 | if (!info || !info->hdev) |
| 507 | /* our irq handler is shared */ | ||
| 508 | return IRQ_NONE; | ||
| 507 | 509 | ||
| 508 | if (!test_bit(CARD_READY, &(info->hw_state))) | 510 | if (!test_bit(CARD_READY, &(info->hw_state))) |
| 509 | return IRQ_HANDLED; | 511 | return IRQ_HANDLED; |