diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 12:09:53 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 12:09:53 -0400 |
commit | 044c31fdf80ed9d8e6bfb33913d085c3efc6febe (patch) | |
tree | 9252cd09defdd29742af6b2bd22db72ce252ab1a /sound/core | |
parent | af7a950284af5526a26b4ae4809c1104b4dc47f3 (diff) | |
parent | c5624f554600ab812fe235690665ee81413cebc3 (diff) |
Merge commit 'v3.0.2' into linaro-3.0
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/timer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 7c1cbf0a0dc..950eed0c098 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -531,6 +531,8 @@ int snd_timer_stop(struct snd_timer_instance *timeri) if (err < 0) return err; timer = timeri->timer; + if (!timer) + return -EINVAL; spin_lock_irqsave(&timer->lock, flags); timeri->cticks = timeri->ticks; timeri->pticks = 0; |