diff --git a/[refs] b/[refs]
index 129eabe897bc..58361f881612 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16b665543864904714f028b1d349f5d905f39afb
+refs/heads/master: 8bfe15f3de0af92fd822b7475878bddc93fa490d
diff --git a/trunk/drivers/staging/android/timed_output.c b/trunk/drivers/staging/android/timed_output.c
index 62e79180421b..f373422308e0 100644
--- a/trunk/drivers/staging/android/timed_output.c
+++ b/trunk/drivers/staging/android/timed_output.c
@@ -41,7 +41,9 @@ static ssize_t enable_store(
 	struct timed_output_dev *tdev = dev_get_drvdata(dev);
 	int value;
 
-	sscanf(buf, "%d", &value);
+	if (sscanf(buf, "%d", &value) != 1)
+		return -EINVAL;
+
 	tdev->enable(tdev, value);
 
 	return size;