807366af38
This patch has been backported to stable kernel 5.4 already. Remove our local patch explicitly now, as by applying the patch (or refreshing) the relevant code is actually added a second time. Refresh remaining patches as well. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Bcc: linux@mail.armlinux.org.uk
|
|
Subject: [PATCH 3/7] i2c: pxa: ensure timeout messages are unique
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
Ensure that the various timeout messages can identify where in the code
|
|
they were produced from to aid debugging.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/i2c/busses/i2c-pxa.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- 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
|
|
ret = i2c->msg_idx;
|
|
|
|
if (!timeout && i2c->msg_num) {
|
|
- i2c_pxa_scream_blue_murder(i2c, "timeout");
|
|
+ i2c_pxa_scream_blue_murder(i2c, "timeout with active message");
|
|
ret = I2C_RETRY;
|
|
}
|
|
|
|
@@ -1124,7 +1124,7 @@ static int i2c_pxa_pio_set_master(struct
|
|
if (timeout < 0) {
|
|
show_state(i2c);
|
|
dev_err(&i2c->adap.dev,
|
|
- "i2c_pxa: timeout waiting for bus free\n");
|
|
+ "i2c_pxa: timeout waiting for bus free (set_master)\n");
|
|
return I2C_RETRY;
|
|
}
|
|
|
|
@@ -1168,7 +1168,7 @@ static int i2c_pxa_do_pio_xfer(struct px
|
|
|
|
out:
|
|
if (timeout == 0) {
|
|
- i2c_pxa_scream_blue_murder(i2c, "timeout");
|
|
+ i2c_pxa_scream_blue_murder(i2c, "timeout (do_pio_xfer)");
|
|
ret = I2C_RETRY;
|
|
}
|
|
|