summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorVarun Wadekar <vwadekar@nvidia.com>2011-01-05 14:50:04 +0530
committerBharat Nihalani <bnihalani@nvidia.com>2011-01-05 06:39:01 -0800
commit53baae0673cf441281dafd55dc2307b268eb7184 (patch)
tree5d7a1956d52bbe7999a25ab753b84907c97f4830 /drivers/i2c
parent609f2ede7b8e183f26725b6aa6db8e357cafef08 (diff)
Revert "i2c: return error if i2c_transfer fails in emulated smbus transfer"
This reverts commit 2947168d5dfa642cd77ab034fc0bea69382350e2. Change-Id: I494b4f80cbab5db2e573b4f796f827354087c212 Reviewed-on: http://git-master/r/14990 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/i2c-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 6a3333efa9c2..bea4c5021d26 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -2015,8 +2015,8 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter *adapter, u16 addr,
}
status = i2c_transfer(adapter, msg, num);
- if (status != num)
- return -EREMOTEIO;
+ if (status < 0)
+ return status;
/* Check PEC if last message is a read */
if (i && (msg[num-1].flags & I2C_M_RD)) {