From 6797b12ce93e87e6dc7fe8eec97012a9cfc28ef3 Mon Sep 17 00:00:00 2001
From: mark gross <markgross@thegnar.org>
Date: Thu, 9 Sep 2010 23:20:09 +0200
Subject: [PATCH] --- yaml --- r: 210615 b: refs/heads/master c:
 0109c2c48d062a04685638926a35ed20153fedc8 h: refs/heads/master i:   210613:
 ee5544236a5aa63dfb53c3c63dc0919bc54b1e65   210611:
 d9c5788c07ba63219ac754025eae1b8d2f26e042   210607:
 f08b82670fb49947ca0d0908c4c118a9485a28a9 v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/pm_qos_params.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ad3c7f757340..5a337a9f431e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 152e1d592071c8b312bb898bc1118b64e4aea535
+refs/heads/master: 0109c2c48d062a04685638926a35ed20153fedc8
diff --git a/trunk/kernel/pm_qos_params.c b/trunk/kernel/pm_qos_params.c
index b7e4c362361b..645e541a45f6 100644
--- a/trunk/kernel/pm_qos_params.c
+++ b/trunk/kernel/pm_qos_params.c
@@ -389,10 +389,12 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
 	} else if (count == 11) { /* len('0x12345678/0') */
 		if (copy_from_user(ascii_value, buf, 11))
 			return -EFAULT;
+		if (strlen(ascii_value) != 10)
+			return -EINVAL;
 		x = sscanf(ascii_value, "%x", &value);
 		if (x != 1)
 			return -EINVAL;
-		pr_debug(KERN_ERR "%s, %d, 0x%x\n", ascii_value, x, value);
+		pr_debug("%s, %d, 0x%x\n", ascii_value, x, value);
 	} else
 		return -EINVAL;