From a908f1ac0876ad78e1f5889bd9a7a8afc78c33b0 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 4 Jul 2008 16:01:14 +0100
Subject: [PATCH] --- yaml --- r: 99155 b: refs/heads/master c:
 73ead4855d98e330f2840523e1648575b9f2aae9 h: refs/heads/master i:   99153:
 1ba107b9755bfb5e886158797dd2bb3274a9e4f8   99151:
 119edab2626a1ccbc11bfc918d8dfa02c79d537c v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-dapm.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 67048f2cb89f..d975424889c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f775987030cf7ff922765c18ddd0d311b4b46ef
+refs/heads/master: 73ead4855d98e330f2840523e1648575b9f2aae9
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
index 7c2dd4ec8df1..91cbbefefb0a 100644
--- a/trunk/sound/soc/soc-dapm.c
+++ b/trunk/sound/soc/soc-dapm.c
@@ -827,7 +827,11 @@ static ssize_t dapm_pop_time_store(struct device *dev,
 				   const char *buf, size_t count)
 
 {
-	if (strict_strtoul(buf, 10, &pop_time) < 0)
+	unsigned long val;
+
+	if (strict_strtoul(buf, 10, &val) >= 0)
+		pop_time = val;
+	else
 		printk(KERN_ERR "Unable to parse pop_time setting\n");
 
 	return count;