patch "iio:ad5064: Make sure ad5064_i2c_write() returns 0 on success" added to staging-linus
Subsystems (3)
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 my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
03fe472ef33b7f31fbd11d300dbb3fdab9c00fd4Mon 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
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.
--- drivers/iio/dac/ad5064.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/iio/dac/ad5064.c +7 -1
@@ -598,10 +598,16 @@ static int ad5064_i2c_write(struct ad5064_state *st, unsigned int cmd, 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,
Signature · 1 line
2.6.2