diff options
| author | David Vrabel <david.vrabel@csr.com> | 2010-02-25 08:35:22 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2010-02-25 08:35:22 -0500 |
| commit | 03806fa20f6a081493a731a4b18ea66317f9f947 (patch) | |
| tree | 630796c65c501e3612253ee4d4af58082a5f984c /drivers/bluetooth/bluecard_cs.c | |
| parent | 35fb2a816a06ded2a3ff83d896c34b83c8e1d556 (diff) | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
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; |