aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2024-04-29 09:14:24 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2024-04-29 09:14:24 +1000
commita69c63e729bf33c9dbb9c2633a9159e6e6834724 (patch)
tree28f6a0aebe6f33918ae9368e050a38c013c643bd
parentff634c852eb6f1e0c3e0f5dd571eed877eee9262 (diff)
parent5deb5b56bccb22d0e8dd8c89e4ffcc0e920aae4c (diff)
downloadlinux-next-a69c63e729bf33c9dbb9c2633a9159e6e6834724.tar.gz
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
-rw-r--r--drivers/i2c/i2c-core-smbus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core-smbus.c b/drivers/i2c/i2c-core-smbus.c
index e3b96fc53b5c25..a942c5306a4e1e 100644
--- a/drivers/i2c/i2c-core-smbus.c
+++ b/drivers/i2c/i2c-core-smbus.c
@@ -596,7 +596,7 @@ s32 __i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
break;
}
- if (res != -EOPNOTSUPP || !adapter->algo->master_xfer)
+ if (res != -EOPNOTSUPP)
goto trace;
/*
* Fall back to i2c_smbus_xfer_emulated if the adapter doesn't