summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-07-04 16:01:14 +0100
committerJaroslav Kysela <perex@perex.cz>2008-07-10 09:32:21 +0200
commit73ead4855d98e330f2840523e1648575b9f2aae9 (patch)
treefa3f20cfcd5da139de81a4865e959998fe003bd5 /sound/soc/soc-dapm.c
parent3f775987030cf7ff922765c18ddd0d311b4b46ef (diff)
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>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c6
1 files changed, 5 insertions, 1 deletions
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;