summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorHezi Shahmoon <hezi@marvell.com>2015-10-20 16:32:24 +0200
committerLuis Henriques <luis.henriques@canonical.com>2015-11-16 11:27:12 +0000
commitc456feae06084e3ed5a9198b158b6361bd083f1e (patch)
tree2f1ce75e6600ee44a4c9e00e169a3f8478f6f1fa /drivers/i2c
parentcb296a33e62cce6ae90321d20f92fc8d691df40e (diff)
downloadlinux-stable-c456feae06084e3ed5a9198b158b6361bd083f1e.tar.gz
linux-stable-c456feae06084e3ed5a9198b158b6361bd083f1e.tar.bz2
linux-stable-c456feae06084e3ed5a9198b158b6361bd083f1e.zip
i2c: mv64xxx: really allow I2C offloading
commit 0729a04977d497cf66234fd7f900ddcec3ef1c52 upstream. Commit 00d8689b85a7 ("i2c: mv64xxx: rework offload support to fix several problems") completely reworked the offload support, but left a debugging-related "return false" at the beginning of the mv64xxx_i2c_can_offload() function. This has the unfortunate consequence that offloading is in fact never used, which wasn't really the intention. This commit fixes that problem by removing the bogus "return false". Fixes: 00d8689b85a7 ("i2c: mv64xxx: rework offload support to fix several problems") Signed-off-by: Hezi Shahmoon <hezi@marvell.com> [Thomas: reworked commit log and title.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-mv64xxx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 1de570e61305..8cc08d4f5f40 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -669,8 +669,6 @@ mv64xxx_i2c_can_offload(struct mv64xxx_i2c_data *drv_data)
struct i2c_msg *msgs = drv_data->msgs;
int num = drv_data->num_msgs;
- return false;
-
if (!drv_data->offload_enabled)
return false;