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/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.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/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch')
| -rw-r--r-- | target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch b/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch index 24cda47789..37a77b6c5c 100644 --- a/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch +++ b/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch @@ -16,7 +16,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c -@@ -1054,7 +1054,7 @@ static int i2c_pxa_do_xfer(struct pxa_i2 +@@ -1052,7 +1052,7 @@ static int i2c_pxa_do_xfer(struct pxa_i2 ret = i2c->msg_idx; if (!timeout && i2c->msg_num) { @@ -25,7 +25,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> ret = I2C_RETRY; } -@@ -1124,7 +1124,7 @@ static int i2c_pxa_pio_set_master(struct +@@ -1122,7 +1122,7 @@ static int i2c_pxa_pio_set_master(struct if (timeout < 0) { show_state(i2c); dev_err(&i2c->adap.dev, @@ -34,7 +34,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> return I2C_RETRY; } -@@ -1168,7 +1168,7 @@ static int i2c_pxa_do_pio_xfer(struct px +@@ -1166,7 +1166,7 @@ static int i2c_pxa_do_pio_xfer(struct px out: if (timeout == 0) { |