From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 4 Jul 2008 15:01:14 +0000 (+0100)
Subject: ALSA: ASoC: Fix warning from strict_strtoul()
X-Git-Tag: v2.6.27-rc1~1111^2~39
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=73ead4855d98e330f2840523e1648575b9f2aae9;p=linux-2.6-omap-h63xx.git

ALSA: ASoC: Fix warning from strict_strtoul()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 7c2dd4ec8df..91cbbefefb0 100644
--- a/sound/soc/soc-dapm.c
+++ b/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;