On 13/10/15 17:23, Lars-Peter Clausen wrote:
> On 10/13/2015 06:15 PM, Lars-Peter Clausen wrote:
>> From: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
>>
>> 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@xxxxxxxxxx>
>
> And obviously
>
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Applied to fixes-togreg.
>
> Sorry for that.
>
>> ---
>> drivers/iio/dac/ad5064.c | 8 +++++++-
>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c
>> index c067e68..7e7ebf3 100644
>> --- a/drivers/iio/dac/ad5064.c
>> +++ b/drivers/iio/dac/ad5064.c
>> @@ -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,
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
