Skip to contentSkip to conversation

iio: dac: mcp4725: Fix i2c_master_send() return value handling

PATCH Applied Marek Vasut 3 participants 3 messages May 11, 2023 – May 13, 2023 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: dac: mcp4725: Fix i2c_master_send() return value handling

The i2c_master_send() returns number of sent bytes on success, or negative on error. The suspend/resume callbacks expect zero on success and non-zero on error. Adapt the return value of the i2c_master_send() to the expectation of the suspend and resume callbacks, including proper validation of the return value.

Fixes cf35ad61aca2 ("iio: add mcp4725 I2C DAC driver")

---
Cc: "Marek Behún" <[email protected]>
Cc: "Uwe Kleine-König" <[email protected]>
Cc: Benjamin Mugnier <[email protected]>
Cc: Hans Verkuil <[email protected]>
Cc: Jonathan Cameron <[email protected]>
Cc: Lars-Peter Clausen <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Maximilian Luz <[email protected]>
Cc: [email protected]

---
 drivers/iio/dac/mcp4725.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/iio/dac/mcp4725.c +14 -2
index 46bf758760f85..3f5661a3718fe 100644
@@ -47,12 +47,18 @@ static int mcp4725_suspend(struct device *dev)
 	struct mcp4725_data *data = iio_priv(i2c_get_clientdata(
 		to_i2c_client(dev)));
 	u8 outbuf[2];
+	int ret;
 
 	outbuf[0] = (data->powerdown_mode + 1) << 4;
 	outbuf[1] = 0;
 	data->powerdown = true;
 
-	return i2c_master_send(data->client, outbuf, 2);
+	ret = i2c_master_send(data->client, outbuf, 2);
+	if (ret < 0)
+		return ret;
+	else if (ret != 2)
+		return -EIO;
+	return 0;
 }
 
 static int mcp4725_resume(struct device *dev)
@@ -60,13 +66,19 @@ static int mcp4725_resume(struct device *dev)
 	struct mcp4725_data *data = iio_priv(i2c_get_clientdata(
 		to_i2c_client(dev)));
 	u8 outbuf[2];
+	int ret;
 
 	/* restore previous DAC value */
 	outbuf[0] = (data->dac_value >> 8) & 0xf;
 	outbuf[1] = data->dac_value & 0xff;
 	data->powerdown = false;
 
-	return i2c_master_send(data->client, outbuf, 2);
+	ret = i2c_master_send(data->client, outbuf, 2);
+	if (ret < 0)
+		return ret;
+	else if (ret != 2)
+		return -EIO;
+	return 0;
 }
 static DEFINE_SIMPLE_DEV_PM_OPS(mcp4725_pm_ops, mcp4725_suspend,
 				mcp4725_resume);
Signature · 1 line
2.39.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Marek Vasut

The i2c_master_send() returns number of sent bytes on success, or negative on error. The suspend/resume callbacks expect zero on success and non-zero on error. Adapt the return value of the i2c_master_send() to the expectation of the suspend and resume callbacks, including proper validation of the return value.

Fixes cf35ad61aca2 ("iio: add mcp4725 I2C DAC driver")

Makes sense,

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
maintainer Applied
#2 lore raw
Quoted 7 lines · On Thu, 11 May 2023 08:15:21 +0200 Uwe Kleine-König…
Quoted 6 lines · Marek Vasut

The i2c_master_send() returns number of sent bytes on success, or negative on error. The suspend/resume callbacks expect zero on success and non-zero on error. Adapt the return value of the i2c_master_send() to the expectation of the suspend and resume callbacks, including proper validation of the return value.

Quoted 6 lines
Quoted 2 lines
Fixes cf35ad61aca2 ("iio: add mcp4725 I2C DAC driver")

Makes sense,

Applied to the fixes-togreg branch of iio.git and marked for stable inclusion

Thanks,

Jonathan

Quoted 4 lines

Best regards
Uwe