Skip to content

Commit

Permalink
drivers/misc/hmc6352.c: fix wrong return value checking for i2c_maste…
Browse files Browse the repository at this point in the history
…r_recv()

i2c_master_recv() returns negative errno, or else the number of bytes
read.  Thus i2c_master_recv(client, i2c_data, 2) returns 2 instead of 1 in
success case.

[akpm@linux-foundation.org: make `ret' signed]
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Kalhan Trisal <kalhan.trisal@intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Axel Lin authored and Linus Torvalds committed Mar 23, 2011
1 parent 4e67359 commit 6f7d485
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/misc/hmc6352.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static ssize_t compass_heading_data_show(struct device *dev,
{
struct i2c_client *client = to_i2c_client(dev);
unsigned char i2c_data[2];
unsigned int ret;
int ret;

mutex_lock(&compass_mutex);
ret = compass_command(client, 'A');
Expand All @@ -86,7 +86,7 @@ static ssize_t compass_heading_data_show(struct device *dev,
msleep(10); /* sending 'A' cmd we need to wait for 7-10 millisecs */
ret = i2c_master_recv(client, i2c_data, 2);
mutex_unlock(&compass_mutex);
if (ret != 1) {
if (ret < 0) {
dev_warn(dev, "i2c read data cmd failed\n");
return ret;
}
Expand Down

0 comments on commit 6f7d485

Please sign in to comment.