diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2010-10-06 04:25:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-06 11:22:44 -0400 |
commit | aecac19179180b7d6cda13f598e314c0870aee80 (patch) | |
tree | 70209aa05bfd1be1dae95f2c2016d37dcc0e22fd | |
parent | e1517c00da6d35911b6451f886d55e22d56393ad (diff) |
staging: iio: adc: ad799x: Address iio list feedback
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>
-rw-r--r-- | drivers/staging/iio/adc/ad799x_core.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c index dca3f2ae6a14..25898563aae8 100644 --- a/drivers/staging/iio/adc/ad799x_core.c +++ b/drivers/staging/iio/adc/ad799x_core.c | |||
@@ -65,13 +65,13 @@ static int ad799x_i2c_read8(struct ad799x_state *st, u8 reg, u8 *data) | |||
65 | struct i2c_client *client = st->client; | 65 | struct i2c_client *client = st->client; |
66 | int ret = 0; | 66 | int ret = 0; |
67 | 67 | ||
68 | ret = i2c_smbus_read_word_data(client, reg); | 68 | ret = i2c_smbus_read_byte_data(client, reg); |
69 | if (ret < 0) { | 69 | if (ret < 0) { |
70 | dev_err(&client->dev, "I2C read error\n"); | 70 | dev_err(&client->dev, "I2C read error\n"); |
71 | return ret; | 71 | return ret; |
72 | } | 72 | } |
73 | 73 | ||
74 | *data = ret; | 74 | *data = (u8)ret; |
75 | 75 | ||
76 | return 0; | 76 | return 0; |
77 | } | 77 | } |
@@ -182,11 +182,10 @@ static ssize_t ad799x_read_single_channel(struct device *dev, | |||
182 | mask = 1 << this_attr->address; | 182 | mask = 1 << this_attr->address; |
183 | /* If ring buffer capture is occuring, query the buffer */ | 183 | /* If ring buffer capture is occuring, query the buffer */ |
184 | if (iio_ring_enabled(dev_info)) { | 184 | if (iio_ring_enabled(dev_info)) { |
185 | data = ad799x_single_channel_from_ring(st, mask); | 185 | data = ret = ad799x_single_channel_from_ring(st, mask); |
186 | if (data < 0) { | 186 | if (ret < 0) |
187 | ret = data; | ||
188 | goto error_ret; | 187 | goto error_ret; |
189 | } | 188 | ret = 0; |
190 | } else { | 189 | } else { |
191 | switch (st->id) { | 190 | switch (st->id) { |
192 | case ad7991: | 191 | case ad7991: |