Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
	drivers/mtd/nand/nand_base.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/video/backlight/lm3639_bl.c b/drivers/video/backlight/lm3639_bl.c
index c6915c6c3cd1..585949b57055 100644
--- a/drivers/video/backlight/lm3639_bl.c
+++ b/drivers/video/backlight/lm3639_bl.c
@@ -206,11 +206,11 @@ static ssize_t lm3639_bled_mode_store(struct device *dev,
 
 out:
         dev_err(pchip->dev, "%s:i2c access fail to register\n", __func__);
-        return size;
+        return ret;
 
 out_input:
         dev_err(pchip->dev, "%s:input conversion fail\n", __func__);
-        return size;
+        return ret;
 
 }