kernel: update 3.14 to 3.14.18

[15.05/openwrt.git] / target / linux / ipq806x / patches / 0064-i2c-qup-Fix-pm_runtime_get_sync-usage.patch

diff --git a/target/linux/ipq806x/patches/0064-i2c-qup-Fix-pm_runtime_get_sync-usage.patch b/target/linux/ipq806x/patches/0064-i2c-qup-Fix-pm_runtime_get_sync-usage.patch
index eaec950..497b57e 100644 (file)
--- a/target/linux/ipq806x/patches/0064-i2c-qup-Fix-pm_runtime_get_sync-usage.patch
+++ b/target/linux/ipq806x/patches/0064-i2c-qup-Fix-pm_runtime_get_sync-usage.patch
@@ -13,11 +13,9 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  drivers/i2c/busses/i2c-qup.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
-index 1b4cf14..2a5efb5 100644
 --- a/drivers/i2c/busses/i2c-qup.c
 +++ b/drivers/i2c/busses/i2c-qup.c
-@@ -479,7 +479,7 @@ static int qup_i2c_xfer(struct i2c_adapter *adap,
+@@ -479,7 +479,7 @@ static int qup_i2c_xfer(struct i2c_adapt
        int ret, idx;
  
        ret = pm_runtime_get_sync(qup->dev);
@@ -26,6 +24,3 @@ index 1b4cf14..2a5efb5 100644
                goto out;
  
        writel(1, qup->base + QUP_SW_RESET);
--- 
-1.7.10.4
-