diff options
| author | Mark Brown | 2010-11-05 09:16:07 -0400 |
|---|---|---|
| committer | Mark Brown | 2010-11-05 09:16:07 -0400 |
| commit | a8ea54da5e47bde9ba19230bb3609b0502a288c3 (patch) | |
| tree | 6b7bb369d86ab185e4a30a0d58ce485f9a00e7e8 /sound/soc/codecs/wm8962.c | |
| parent | 11e16eb365f4f6979cfcb2a2d379338b383590d9 (diff) | |
| parent | 6424dca23e6b5a2f7a19a69cf7c0990b11717b00 (diff) | |
Merge branch 'for-2.6.37' into HEAD
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 2eaf9bb36b57..3fc63b43c6a1 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3502,8 +3502,11 @@ static ssize_t wm8962_beep_set(struct device *dev, { struct wm8962_priv *wm8962 = dev_get_drvdata(dev); long int time; + int ret; - strict_strtol(buf, 10, &time); + ret = strict_strtol(buf, 10, &time); + if (ret != 0) + return ret; input_event(wm8962->beep, EV_SND, SND_TONE, time); |