diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 15:16:27 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 21:12:42 +0200 |
commit | 68d9cb82143b864d70e4fb3d7cbb7068f82216a1 (patch) | |
tree | 937de971cb0239c77a2e533022aba3fd4a8f36ba /target/linux/generic/backport-5.4/816-v5.8-i2c-pxa-avoid-complaints-with-non-responsive-slaves.patch | |
parent | 6062d858929df927e244280ec4864b35a217d6d1 (diff) | |
download | upstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.tar.gz upstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.tar.bz2 upstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.zip |
kernel: Update kernel 5.4 to version 5.4.50
Run tested: ath79, ipq40xx
Build tested: ath79, ipq40xx
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-5.4/816-v5.8-i2c-pxa-avoid-complaints-with-non-responsive-slaves.patch')
-rw-r--r-- | target/linux/generic/backport-5.4/816-v5.8-i2c-pxa-avoid-complaints-with-non-responsive-slaves.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.4/816-v5.8-i2c-pxa-avoid-complaints-with-non-responsive-slaves.patch b/target/linux/generic/backport-5.4/816-v5.8-i2c-pxa-avoid-complaints-with-non-responsive-slaves.patch index f56e5b647f..63e6db80ad 100644 --- a/target/linux/generic/backport-5.4/816-v5.8-i2c-pxa-avoid-complaints-with-non-responsive-slaves.patch +++ b/target/linux/generic/backport-5.4/816-v5.8-i2c-pxa-avoid-complaints-with-non-responsive-slaves.patch @@ -33,7 +33,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> #define BUS_ERROR (-EREMOTEIO) #define XFER_NAKED (-ECONNREFUSED) #define I2C_RETRY (-2000) /* an error has occurred retry transmit */ -@@ -840,7 +841,7 @@ static void i2c_pxa_irq_txempty(struct p +@@ -838,7 +839,7 @@ static void i2c_pxa_irq_txempty(struct p */ if (isr & ISR_ACKNAK) { if (i2c->msg_ptr == 0 && i2c->msg_idx == 0) @@ -42,7 +42,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> else ret = XFER_NAKED; } -@@ -1068,16 +1069,19 @@ static int i2c_pxa_internal_xfer(struct +@@ -1066,16 +1067,19 @@ static int i2c_pxa_internal_xfer(struct { int ret, i; |