brcm2708: update against latest rpi-3.10.y branch

[openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0067-Avoid-responding-to-unexpected-I2C-interrupts.patch

diff --git a/target/linux/brcm2708/patches-3.10/0067-Avoid-responding-to-unexpected-I2C-interrupts.patch b/target/linux/brcm2708/patches-3.10/0067-Avoid-responding-to-unexpected-I2C-interrupts.patch
new file mode 100644 (file)
index 0000000..4d62046
--- /dev/null
+++ b/target/linux/brcm2708/patches-3.10/0067-Avoid-responding-to-unexpected-I2C-interrupts.patch
@@ -0,0 +1,31 @@
+From 03f44ba654e40b60ffcec14030abf35152d0b639 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Thu, 13 Jun 2013 16:46:54 +0100
+Subject: [PATCH 067/174] Avoid responding to unexpected I2C interrupts
+
+---
+ drivers/i2c/busses/i2c-bcm2708.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/i2c/busses/i2c-bcm2708.c
++++ b/drivers/i2c/busses/i2c-bcm2708.c
+@@ -175,6 +175,11 @@ static irqreturn_t bcm2708_i2c_interrupt
+ 
+       spin_lock(&bi->lock);
+ 
++      /* we may see camera interrupts on the "other" I2C channel
++           Just return if we've not sent anything */
++        if (!bi->nmsgs || !bi->msg )
++              goto early_exit;
++
+       s = bcm2708_rd(bi, BSC_S);
+ 
+       if (s & (BSC_S_CLKT | BSC_S_ERR)) {
+@@ -208,6 +213,7 @@ static irqreturn_t bcm2708_i2c_interrupt
+               handled = false;
+       }
+ 
++early_exit:
+       spin_unlock(&bi->lock);
+ 
+       return handled ? IRQ_HANDLED : IRQ_NONE;