Merge branch 'for-2.6.37' into HEAD

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);