OSDN Git Service

i2c: mux: pca954x: fix i2c mux selection caching
authorRussell King <rmk+kernel@armlinux.org.uk>
Sat, 17 Dec 2016 12:10:56 +0000 (12:10 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jan 2017 19:18:05 +0000 (20:18 +0100)
commit26eae206b78669ec4994d047a4b9418b1c588e35
tree75200eb54e7f7f5914eec154a499a216d8f71334
parent396b25173370fc1afa3bc91a315d5597c2b10734
i2c: mux: pca954x: fix i2c mux selection caching

commit 7f638c1cb0a1112dbe0b682a42db30521646686b upstream.

smbus functions return -ve on error, 0 on success.  However,
__i2c_transfer() have a different return signature - -ve on error, or
number of buffers transferred (which may be zero or greater.)

The upshot of this is that the sense of the test is reversed when using
the mux on a bus supporting the master_xfer method: we cache the value
and never retry if we fail to transfer any buffers, but if we succeed,
we clear the cached value.

Fix this by making pca954x_reg_write() return a negative error code for
all failure cases.

Fixes: 463e8f845cbf ("i2c: mux: pca954x: retry updating the mux selection on failure")
Acked-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/i2c/muxes/i2c-mux-pca954x.c