Skip to contentSkip to conversation

Patch "iio:ad5064: Make sure ad5064_i2c_write() returns 0 on success" has been added to the 3.10-stable tree

PATCH [email protected] 1 participant 1 message Feb 24, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

    iio:ad5064: Make sure ad5064_i2c_write() returns 0 on success

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     iio-ad5064-make-sure-ad5064_i2c_write-returns-0-on-success.patch

and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 03fe472ef33b7f31fbd11d300dbb3fdab9c00fd4 Mon Sep 17 00:00:00 2001

From: Michael Hennerich <[email protected]>
Date: Tue, 13 Oct 2015 18:15:37 +0200
Subject: iio:ad5064: Make sure ad5064_i2c_write() returns 0 on success

From: Michael Hennerich <[email protected]>

commit 03fe472ef33b7f31fbd11d300dbb3fdab9c00fd4 upstream.

i2c_master_send() returns the number of bytes transferred on success while the ad5064 driver expects that the write() callback returns 0 on success. Fix that by translating any non negative return value of i2c_master_send() to 0.

Fixes commit 6a17a0768f77 ("iio:dac:ad5064: Add support for the ad5629r and ad5669r")
---
 drivers/iio/dac/ad5064.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/iio/dac/ad5064.c +7 -1
@@ -602,10 +602,16 @@ static int ad5064_i2c_write(struct ad506
 	unsigned int addr, unsigned int val)
 {
 	struct i2c_client *i2c = to_i2c_client(st->dev);
+	int ret;
 
 	st->data.i2c[0] = (cmd << 4) | addr;
 	put_unaligned_be16(val, &st->data.i2c[1]);
-	return i2c_master_send(i2c, st->data.i2c, 3);
+
+	ret = i2c_master_send(i2c, st->data.i2c, 3);
+	if (ret < 0)
+		return ret;
+
+	return 0;
 }
 
 static int ad5064_i2c_probe(struct i2c_client *i2c,

Patches currently in stable-queue which might be from [email protected] are

queue-3.10/iio-ad5064-make-sure-ad5064_i2c_write-returns-0-on-success.patch