diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-21 16:56:52 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-21 16:56:52 +0400 |
commit | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (patch) | |
tree | 8158b4c88b59391274d539a7e8e6985446d900e7 /drivers/net/wireless/cw1200/cw1200_spi.c | |
parent | e64001e8efc107992fd835770f6383d0dc731594 (diff) | |
parent | 254dc326dbfd23c2678fafad1b84fc0e42ac4374 (diff) | |
download | linux-16ec790938d4f356c82fab27b9a9adf4d6fe19a6.tar.xz |
Merge tag 'ib-asoc-1' of git://git.linaro.org/people/ljones/mfd into asoc-arizona
Immutable branch for ASoC, as requested by Mark Brown
Diffstat (limited to 'drivers/net/wireless/cw1200/cw1200_spi.c')
-rw-r--r-- | drivers/net/wireless/cw1200/cw1200_spi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/cw1200/cw1200_spi.c b/drivers/net/wireless/cw1200/cw1200_spi.c index 899cad34ccd3..755a0c8edfe1 100644 --- a/drivers/net/wireless/cw1200/cw1200_spi.c +++ b/drivers/net/wireless/cw1200/cw1200_spi.c @@ -237,7 +237,9 @@ static irqreturn_t cw1200_spi_irq_handler(int irq, void *dev_id) struct hwbus_priv *self = dev_id; if (self->core) { + cw1200_spi_lock(self); cw1200_irq_handler(self->core); + cw1200_spi_unlock(self); return IRQ_HANDLED; } else { return IRQ_NONE; |