lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/misc/hmc6352.c: fix wrong return value checking for i2c_master_recv()

Browse Source 
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>
This commit is contained in:
Axel Lin
2011-03-22 16:34:00 -07:00
committed by Linus Torvalds
parent 4e67359923
commit 6f7d485e13
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/hmc6352.c
View File

@@ -75,7 +75,7 @@ static ssize_t compass_heading_data_show(struct device *dev,
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
unsigned char i2c_data[2]; unsigned char i2c_data[2];
unsigned int ret; int ret;
mutex_lock(&compass_mutex); mutex_lock(&compass_mutex);
ret = compass_command(client, 'A'); ret = compass_command(client, 'A');
@@ -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 */ msleep(10); /* sending 'A' cmd we need to wait for 7-10 millisecs */
ret = i2c_master_recv(client, i2c_data, 2); ret = i2c_master_recv(client, i2c_data, 2);
mutex_unlock(&compass_mutex); mutex_unlock(&compass_mutex);
if (ret != 1) { if (ret < 0) {
dev_warn(dev, "i2c read data cmd failed\n"); dev_warn(dev, "i2c read data cmd failed\n");
return ret; return ret;
} }