diff --git a/[refs] b/[refs]
index de38a9b044ce..f06eec246c75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63a4a8bad9715421e9efdfba6455c7a25d1be6e7
+refs/heads/master: bb950a169d98ac9a2b8a899f95ed5d784c14f3cc
diff --git a/trunk/drivers/staging/line6/toneport.c b/trunk/drivers/staging/line6/toneport.c
index 84bf29c33515..e6770ea17936 100644
--- a/trunk/drivers/staging/line6/toneport.c
+++ b/trunk/drivers/staging/line6/toneport.c
@@ -96,8 +96,14 @@ static ssize_t toneport_set_led_red(struct device *dev,
 				    struct device_attribute *attr,
 				    const char *buf, size_t count)
 {
-	char *c;
-	led_red = simple_strtol(buf, &c, 10);
+	int retval;
+	long value;
+
+	retval = strict_strtol(buf, 10, &value);
+	if (retval)
+		return retval;
+
+	led_red = value;
 	toneport_update_led(dev);
 	return count;
 }
@@ -106,8 +112,14 @@ static ssize_t toneport_set_led_green(struct device *dev,
 				      struct device_attribute *attr,
 				      const char *buf, size_t count)
 {
-	char *c;
-	led_green = simple_strtol(buf, &c, 10);
+	int retval;
+	long value;
+
+	retval = strict_strtol(buf, 10, &value);
+	if (retval)
+		return retval;
+
+	led_green = value;
 	toneport_update_led(dev);
 	return count;
 }