diff options
author | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-03 14:18:42 +0000 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-03 14:18:42 +0000 |
commit | 33ee617f4dad370bee016e4462e69481257453b0 (patch) | |
tree | a548faeea3be445d6ddfceeb1d235286f0df7cfd /sound/soc/soc-core.c | |
parent | 0a27f050abcd661cd4838e1b1ced117ec19d0d99 (diff) | |
parent | 9e3be1edbe5ca57df51140b523168237b3a01f4d (diff) | |
download | kernel_goldelico_gta04-33ee617f4dad370bee016e4462e69481257453b0.zip kernel_goldelico_gta04-33ee617f4dad370bee016e4462e69481257453b0.tar.gz kernel_goldelico_gta04-33ee617f4dad370bee016e4462e69481257453b0.tar.bz2 |
Merge remote branch 'tiwai/topic/asoc' into for-2.6.38
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1c8f3f5..614a8b3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -165,8 +165,11 @@ static ssize_t pmdown_time_set(struct device *dev, { struct snd_soc_pcm_runtime *rtd = container_of(dev, struct snd_soc_pcm_runtime, dev); + int ret; - strict_strtol(buf, 10, &rtd->pmdown_time); + ret = strict_strtol(buf, 10, &rtd->pmdown_time); + if (ret) + return ret; return count; } |