diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2015-10-13 18:15:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-25 11:57:48 -0800 |
| commit | 3effd3faeaa18907ba672f4545d0ba4602a2eb8b (patch) | |
| tree | 9f6b5109205fdaa5b68dc823ab4b7548ac875af5 | |
| parent | aac11e32617a7de35937748d1f33aae33be0dff0 (diff) | |
| download | lwn-3effd3faeaa18907ba672f4545d0ba4602a2eb8b.tar.gz lwn-3effd3faeaa18907ba672f4545d0ba4602a2eb8b.zip | |
iio:ad5064: Make sure ad5064_i2c_write() returns 0 on success
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")
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/iio/dac/ad5064.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c index aa26d50ab638..4eda4ea037b7 100644 --- a/drivers/iio/dac/ad5064.c +++ b/drivers/iio/dac/ad5064.c @@ -602,10 +602,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, |