Merge commit 'v2.6.38-rc4' into imx-for-2.6.39

Conflicts:
	arch/arm/mach-mxs/clock-mx28.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/leds/ledtrig-gpio.c b/drivers/leds/ledtrig-gpio.c
index 991d93be0f44..ecc4bf3f37a9 100644
--- a/drivers/leds/ledtrig-gpio.c
+++ b/drivers/leds/ledtrig-gpio.c
@@ -99,7 +99,7 @@ static ssize_t gpio_trig_inverted_show(struct device *dev,
         struct led_classdev *led = dev_get_drvdata(dev);
         struct gpio_trig_data *gpio_data = led->trigger_data;
 
-        return sprintf(buf, "%s\n", gpio_data->inverted ? "yes" : "no");
+        return sprintf(buf, "%u\n", gpio_data->inverted);
 }
 
 static ssize_t gpio_trig_inverted_store(struct device *dev,
@@ -107,16 +107,17 @@ static ssize_t gpio_trig_inverted_store(struct device *dev,
 {
         struct led_classdev *led = dev_get_drvdata(dev);
         struct gpio_trig_data *gpio_data = led->trigger_data;
-        unsigned inverted;
+        unsigned long inverted;
         int ret;
 
-        ret = sscanf(buf, "%u", &inverted);
-        if (ret < 1) {
-                dev_err(dev, "invalid value\n");
+        ret = strict_strtoul(buf, 10, &inverted);
+        if (ret < 0)
+                return ret;
+
+        if (inverted > 1)
                 return -EINVAL;
-        }
 
-        gpio_data->inverted = !!inverted;
+        gpio_data->inverted = inverted;
 
         /* After inverting, we need to update the LED. */
         schedule_work(&gpio_data->work);