From eccb6638569ae80eb4cb198640baac229fde4ff0 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sun, 7 Oct 2012 20:54:23 -0700 Subject: leds: lm3642: Return proper error in lm3642_[torch|strobe]_pin_store error paths Signed-off-by: Axel Lin Acked-by: G.Shark Jeong Signed-off-by: Bryan Wu --- drivers/leds/leds-lm3642.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/leds/leds-lm3642.c') diff --git a/drivers/leds/leds-lm3642.c b/drivers/leds/leds-lm3642.c index 3285006e9888..b69acac6d711 100644 --- a/drivers/leds/leds-lm3642.c +++ b/drivers/leds/leds-lm3642.c @@ -201,10 +201,10 @@ static ssize_t lm3642_torch_pin_store(struct device *dev, return size; out: dev_err(chip->dev, "%s:i2c access fail to register\n", __func__); - return size; + return ret; out_strtoint: dev_err(chip->dev, "%s: fail to change str to int\n", __func__); - return size; + return ret; } static DEVICE_ATTR(torch_pin, 0666, NULL, lm3642_torch_pin_store); @@ -258,10 +258,10 @@ static ssize_t lm3642_strobe_pin_store(struct device *dev, return size; out: dev_err(chip->dev, "%s:i2c access fail to register\n", __func__); - return size; + return ret; out_strtoint: dev_err(chip->dev, "%s: fail to change str to int\n", __func__); - return size; + return ret; } static DEVICE_ATTR(strobe_pin, 0666, NULL, lm3642_strobe_pin_store); -- cgit v1.2.3 From 5cce0105c8d07d3bd5f578c77d273e1a1e09f157 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 29 Oct 2012 01:41:46 -0700 Subject: leds: lm3642: Fix up world writable sysfs files We don't need these sysfs files to be world writable or group writable. These files are write-only, change them to S_IWUSR (0200). Signed-off-by: Axel Lin Acked-by: G.Shark Jeong Signed-off-by: Bryan Wu --- drivers/leds/leds-lm3642.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/leds/leds-lm3642.c') diff --git a/drivers/leds/leds-lm3642.c b/drivers/leds/leds-lm3642.c index b69acac6d711..83fc7d70da12 100644 --- a/drivers/leds/leds-lm3642.c +++ b/drivers/leds/leds-lm3642.c @@ -207,7 +207,7 @@ out_strtoint: return ret; } -static DEVICE_ATTR(torch_pin, 0666, NULL, lm3642_torch_pin_store); +static DEVICE_ATTR(torch_pin, S_IWUSR, NULL, lm3642_torch_pin_store); static void lm3642_deferred_torch_brightness_set(struct work_struct *work) { @@ -264,7 +264,7 @@ out_strtoint: return ret; } -static DEVICE_ATTR(strobe_pin, 0666, NULL, lm3642_strobe_pin_store); +static DEVICE_ATTR(strobe_pin, S_IWUSR, NULL, lm3642_strobe_pin_store); static void lm3642_deferred_strobe_brightness_set(struct work_struct *work) { -- cgit v1.2.3