[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20250612-jaybird-arrange-53b6200548e9@wendy>
Date: Thu, 12 Jun 2025 12:12:49 +0100
From: Conor Dooley <conor.dooley@...rochip.com>
To: <linux-i2c@...r.kernel.org>
CC: Conor Dooley <conor.dooley@...rochip.com>, Daire McNamara
<daire.mcnamara@...rochip.com>, Andi Shyti <andi.shyti@...nel.org>,
<linux-kernel@...r.kernel.org>
Subject: [RESEND PATCH v1] i2c: microchip-core: re-fix fake detections w/ i2cdetect
Introducing support for smbus re-broke i2cdetect, causing it to detect
devices at every i2c address, just as it did prior to being fixed in
commit 49e1f0fd0d4cb ("i2c: microchip-core: fix "ghost" detections").
This was caused by an oversight, where the new smbus code failed to
check the return value of mchp_corei2c_xfer(). Check it, and propagate
any errors.
Fixes: d6ceb40538263 ("i2c: microchip-corei2c: add smbus support")
Signed-off-by: Conor Dooley <conor.dooley@...rochip.com>
---
Resending cos I think it attempted a send using my korg address on a
network where that is not possible.
CC: Conor Dooley <conor.dooley@...rochip.com>
CC: Daire McNamara <daire.mcnamara@...rochip.com>
CC: Andi Shyti <andi.shyti@...nel.org>
CC: linux-i2c@...r.kernel.org
CC: linux-kernel@...r.kernel.org
---
drivers/i2c/busses/i2c-microchip-corei2c.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-microchip-corei2c.c b/drivers/i2c/busses/i2c-microchip-corei2c.c
index 492bf4c34722c..a4611381c4f0b 100644
--- a/drivers/i2c/busses/i2c-microchip-corei2c.c
+++ b/drivers/i2c/busses/i2c-microchip-corei2c.c
@@ -435,6 +435,7 @@ static int mchp_corei2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned
u8 tx_buf[I2C_SMBUS_BLOCK_MAX + 2];
u8 rx_buf[I2C_SMBUS_BLOCK_MAX + 1];
int num_msgs = 1;
+ int ret;
msgs[CORE_I2C_SMBUS_MSG_WR].addr = addr;
msgs[CORE_I2C_SMBUS_MSG_WR].flags = 0;
@@ -505,7 +506,10 @@ static int mchp_corei2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned
return -EOPNOTSUPP;
}
- mchp_corei2c_xfer(&idev->adapter, msgs, num_msgs);
+ ret = mchp_corei2c_xfer(&idev->adapter, msgs, num_msgs);
+ if (ret)
+ return ret;
+
if (read_write == I2C_SMBUS_WRITE || size <= I2C_SMBUS_BYTE_DATA)
return 0;
--
2.49.0
Powered by blists - more mailing lists