From baa4780d4f153747d7759f3fb926189985cf2cea Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 8 Aug 2011 12:24:46 +0200
Subject: [PATCH] --- yaml --- r: 262680 b: refs/heads/master c:
 0584ffa548b6e59aceb027112f23a55f0133400e h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/sound/core/timer.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5bffb2677800..04796476aaa1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67ada8367c323ce13d0268c87cf09bf8af956e92
+refs/heads/master: 0584ffa548b6e59aceb027112f23a55f0133400e
diff --git a/trunk/sound/core/timer.c b/trunk/sound/core/timer.c
index 7c1cbf0a0dc4..950eed0c098e 100644
--- a/trunk/sound/core/timer.c
+++ b/trunk/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;