Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dc7b82e authored by Richard Purdie's avatar Richard Purdie Committed by Linus Torvalds
Browse files

[PATCH] LED: Fix sysfs store function error handling 



Fix the error handling of some LED _store functions.  This corrects them to
return -EINVAL if the value is not numeric with an optional byte of trailing
whitespace.

Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 263de9b5

drivers/leds/led-class.c

+7 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/sysdev.h>

#include <linux/timer.h>

#include <linux/err.h>

#include <linux/ctype.h>

#include <linux/leds.h>

#include "leds.h"
@@ -43,9 +44,13 @@ static ssize_t led_brightness_store(struct class_device *dev, 
	ssize_t ret = -EINVAL;

	char *after;

	unsigned long state = simple_strtoul(buf, &after, 10);

	size_t count = after - buf;



	if (after - buf > 0) {

		ret = after - buf;

	if (*after && isspace(*after))

		count++;



	if (count == size) {

		ret = count;

		led_set_brightness(led_cdev, state);

	}

drivers/leds/ledtrig-timer.c

+13 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/device.h>

#include <linux/sysdev.h>

#include <linux/timer.h>

#include <linux/ctype.h>

#include <linux/leds.h>

#include "leds.h"
@@ -69,11 +70,15 @@ static ssize_t led_delay_on_store(struct class_device *dev, const char *buf, 
	int ret = -EINVAL;

	char *after;

	unsigned long state = simple_strtoul(buf, &after, 10);

	size_t count = after - buf;



	if (after - buf > 0) {

	if (*after && isspace(*after))

		count++;



	if (count == size) {

		timer_data->delay_on = state;

		mod_timer(&timer_data->timer, jiffies + 1);

		ret = after - buf;

		ret = count;

	}



	return ret;
@@ -97,11 +102,15 @@ static ssize_t led_delay_off_store(struct class_device *dev, const char *buf, 
	int ret = -EINVAL;

	char *after;

	unsigned long state = simple_strtoul(buf, &after, 10);

	size_t count = after - buf;



	if (*after && isspace(*after))

		count++;



	if (after - buf > 0) {

	if (count == size) {

		timer_data->delay_off = state;

		mod_timer(&timer_data->timer, jiffies + 1);

		ret = after - buf;

		ret = count;

	}



	return ret;