brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014
[openwrt/svn-archive/archive.git] / target / linux / brcm2708 / patches-3.10 / 0067-Avoid-responding-to-unexpected-I2C-interrupts.patch
1 From ed5a728f2593fbd3950c5c17ab7143bafc295e57 Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Thu, 13 Jun 2013 16:46:54 +0100
4 Subject: [PATCH 067/196] Avoid responding to unexpected I2C interrupts
5
6 ---
7 drivers/i2c/busses/i2c-bcm2708.c | 6 ++++++
8 1 file changed, 6 insertions(+)
9
10 diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c
11 index edc90c0..33f4e7d 100644
12 --- a/drivers/i2c/busses/i2c-bcm2708.c
13 +++ b/drivers/i2c/busses/i2c-bcm2708.c
14 @@ -175,6 +175,11 @@ static irqreturn_t bcm2708_i2c_interrupt(int irq, void *dev_id)
15
16 spin_lock(&bi->lock);
17
18 + /* we may see camera interrupts on the "other" I2C channel
19 + Just return if we've not sent anything */
20 + if (!bi->nmsgs || !bi->msg )
21 + goto early_exit;
22 +
23 s = bcm2708_rd(bi, BSC_S);
24
25 if (s & (BSC_S_CLKT | BSC_S_ERR)) {
26 @@ -208,6 +213,7 @@ static irqreturn_t bcm2708_i2c_interrupt(int irq, void *dev_id)
27 handled = false;
28 }
29
30 +early_exit:
31 spin_unlock(&bi->lock);
32
33 return handled ? IRQ_HANDLED : IRQ_NONE;
34 --
35 1.9.1
36