kernel/4.3: update to version 4.3.3

[openwrt/staging/stintel.git] / target / linux / imx6 / patches-4.3 / 207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch

diff --git a/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch b/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch
index bfb5707ff0ea66619627a28950fc8f91a691170a..fa3bf138f65dd38882f60370abf685541e0e13ea 100644 (file)
--- a/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch
+++ b/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch
@@ -1,8 +1,6 @@
-Index: linux-4.3/drivers/i2c/busses/i2c-imx.c
-===================================================================
---- linux-4.3.orig/drivers/i2c/busses/i2c-imx.c        2015-11-01 16:05:25.000000000 -0800
-+++ linux-4.3/drivers/i2c/busses/i2c-imx.c     2015-12-18 10:39:44.971158318 -0800
-@@ -461,6 +461,8 @@
+--- a/drivers/i2c/busses/i2c-imx.c
++++ b/drivers/i2c/busses/i2c-imx.c
+@@ -461,6 +461,8 @@ static int i2c_imx_acked(struct imx_i2c_
  {
        if (imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR) & I2SR_RXAK) {
                dev_dbg(&i2c_imx->adapter.dev, "<%s> No ACK\n", __func__);
@@ -11,7 +9,7 @@ Index: linux-4.3/drivers/i2c/busses/i2c-imx.c
                return -EIO;  /* No ACK */
        }
  
-@@ -1010,6 +1012,10 @@
+@@ -1010,6 +1012,10 @@ static int i2c_imx_probe(struct platform
        i2c_imx->adapter.nr             = pdev->id;
        i2c_imx->adapter.dev.of_node    = pdev->dev.of_node;
        i2c_imx->base                   = base;