Skip to content

Commit

Permalink
i2c: octeon: Prevent error message on bus error
Browse files Browse the repository at this point in the history
The error message:

[Fri Feb 16 13:42:13 2018] i2c-thunderx 0000:01:09.4: unhandled state: 0

is mis-leading as state 0 (bus error) is not an unknown state.

Return -EIO as before but avoid printing the message. Also rename
STAT_ERROR to STATE_BUS_ERROR.

Signed-off-by: Jan Glauber <jglauber@cavium.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  • Loading branch information
Jan Glauber authored and Wolfram Sang committed Mar 2, 2018
1 parent 1a0e3a3 commit 7c42467
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions drivers/i2c/busses/i2c-octeon-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ static int octeon_i2c_check_status(struct octeon_i2c *i2c, int final_read)
return -EOPNOTSUPP;

case STAT_TXDATA_NAK:
case STAT_BUS_ERROR:
return -EIO;
case STAT_TXADDR_NAK:
case STAT_RXADDR_NAK:
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-octeon-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#define TWSI_CTL_AAK 0x04 /* Assert ACK */

/* Status values */
#define STAT_ERROR 0x00
#define STAT_BUS_ERROR 0x00
#define STAT_START 0x08
#define STAT_REP_START 0x10
#define STAT_TXADDR_ACK 0x18
Expand Down

0 comments on commit 7c42467

Please sign in to comment.