evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: iio: adc: ad799x: Address iio list feedback

Browse source 
Address feedback from Shubhrajyoti Datta:
	Cast return value
Michael Hennerich:
	Use i2c_smbus_read_byte_data()
	Fix return value check

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Michael Hennerich 2010-10-06 10:25:49 +02:00 • committed by Greg Kroah-Hartman
parent e1517c00da
commit aecac19179
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/staging/iio/adc/ad799x_core.c
View file

@ -65,13 +65,13 @@ static int ad799x_i2c_read8(struct ad799x_state *st, u8 reg, u8 *data)
struct i2c_client *client = st->client; struct i2c_client *client = st->client;
int ret = 0; int ret = 0;
ret = i2c_smbus_read_word_data(client, reg); ret = i2c_smbus_read_byte_data(client, reg);
if (ret < 0) { if (ret < 0) {
dev_err(&client->dev, "I2C read error\n"); dev_err(&client->dev, "I2C read error\n");
return ret; return ret;
} }
*data = ret; *data = (u8)ret;
return 0; return 0;
} }
@ -182,11 +182,10 @@ static ssize_t ad799x_read_single_channel(struct device *dev,
mask = 1 << this_attr->address; mask = 1 << this_attr->address;
/* If ring buffer capture is occuring, query the buffer */ /* If ring buffer capture is occuring, query the buffer */
if (iio_ring_enabled(dev_info)) { if (iio_ring_enabled(dev_info)) {
data = ad799x_single_channel_from_ring(st, mask); data = ret = ad799x_single_channel_from_ring(st, mask);
if (data < 0) { if (ret < 0)
ret = data;
goto error_ret; goto error_ret;
} ret = 0;
} else { } else {
switch (st->id) { switch (st->id) {
case ad7991: case ad7991: