diff --git a/[refs] b/[refs] index a4065b8d5e9d..892e32b95929 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7de993503aa23f34d58b7945cf00ad9a9486bda +refs/heads/master: cdf5e55124e4804fc0027df7e89567a3f5eed8bf diff --git a/trunk/drivers/staging/line6/pcm.c b/trunk/drivers/staging/line6/pcm.c index 5e319e3ce685..7fe44a6fd0ed 100644 --- a/trunk/drivers/staging/line6/pcm.c +++ b/trunk/drivers/staging/line6/pcm.c @@ -48,7 +48,13 @@ static ssize_t pcm_set_impulse_volume(struct device *dev, const char *buf, size_t count) { struct snd_line6_pcm *line6pcm = dev2pcm(dev); - int value = simple_strtoul(buf, NULL, 10); + int value; + int rv; + + rv = kstrtoint(buf, 10, &value); + if (rv < 0) + return rv; + line6pcm->impulse_volume = value; if (value > 0)