kernel: bump 4.9 to 4.9.137

[openwrt/staging/chunkeey.git] / target / linux / brcm2708 / patches-4.9 / 950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch

diff --git a/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch b/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
index 0cd5aa4693411dbc678c81a0d943112d674a17f9..9ae16e426ae1bb20873b961c459e9b5b44c5fcf9 100644 (file)
--- a/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
@@ -86,7 +86,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
   * Note about I2C_C_CLEAR on error:
   * The I2C_C_CLEAR on errors will take some time to resolve -- if you were in
   * non-idle state and I2C_C_READ, it sets an abort_rx flag and runs through
-@@ -151,6 +191,12 @@ static irqreturn_t bcm2835_i2c_isr(int t
+@@ -153,6 +193,12 @@ static irqreturn_t bcm2835_i2c_isr(int t
                }
  
                bcm2835_fill_txfifo(i2c_dev);
@@ -99,7 +99,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
                return IRQ_HANDLED;
        }
  
-@@ -175,30 +221,25 @@ complete:
+@@ -177,30 +223,25 @@ complete:
        return IRQ_HANDLED;
  }
  
@@ -144,7 +144,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
  
        time_left = wait_for_completion_timeout(&i2c_dev->completion,
                                                BCM2835_I2C_TIMEOUT);
-@@ -209,31 +250,15 @@ static int bcm2835_i2c_xfer_msg(struct b
+@@ -211,31 +252,15 @@ static int bcm2835_i2c_xfer_msg(struct b
                return -ETIMEDOUT;
        }