aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 528f8708221d..5471940dc0f7 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -203,7 +203,7 @@ static ssize_t pmdown_time_set(struct device *dev,
203 struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev); 203 struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev);
204 int ret; 204 int ret;
205 205
206 ret = strict_strtol(buf, 10, &rtd->pmdown_time); 206 ret = kstrtol(buf, 10, &rtd->pmdown_time);
207 if (ret) 207 if (ret)
208 return ret; 208 return ret;
209 209
@@ -248,6 +248,7 @@ static ssize_t codec_reg_write_file(struct file *file,
248 char *start = buf; 248 char *start = buf;
249 unsigned long reg, value; 249 unsigned long reg, value;
250 struct snd_soc_codec *codec = file->private_data; 250 struct snd_soc_codec *codec = file->private_data;
251 int ret;
251 252
252 buf_size = min(count, (sizeof(buf)-1)); 253 buf_size = min(count, (sizeof(buf)-1));
253 if (copy_from_user(buf, user_buf, buf_size)) 254 if (copy_from_user(buf, user_buf, buf_size))
@@ -259,8 +260,9 @@ static ssize_t codec_reg_write_file(struct file *file,
259 reg = simple_strtoul(start, &start, 16); 260 reg = simple_strtoul(start, &start, 16);
260 while (*start == ' ') 261 while (*start == ' ')
261 start++; 262 start++;
262 if (strict_strtoul(start, 16, &value)) 263 ret = kstrtoul(start, 16, &value);
263 return -EINVAL; 264 if (ret)
265 return ret;
264 266
265 /* Userspace has been fiddling around behind the kernel's back */ 267 /* Userspace has been fiddling around behind the kernel's back */
266 add_taint(TAINT_USER, LOCKDEP_NOW_UNRELIABLE); 268 add_taint(TAINT_USER, LOCKDEP_NOW_UNRELIABLE);