From 9b9f94d454badd13cdc01377fcd928129ac22217 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 8 Aug 2011 12:28:22 +0200
Subject: [PATCH] --- yaml --- r: 262681 b: refs/heads/master c:
 94094c8aaeded11f8b99734b9ebdaada20b5f24a h: refs/heads/master i:   262679:
 91e6977afd0e8ea114bbdc21cab13ff90188ed27 v: v3

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

diff --git a/[refs] b/[refs]
index 04796476aaa1..698d16759f89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0584ffa548b6e59aceb027112f23a55f0133400e
+refs/heads/master: 94094c8aaeded11f8b99734b9ebdaada20b5f24a
diff --git a/trunk/sound/core/timer.c b/trunk/sound/core/timer.c
index 950eed0c098e..67ebf1c21c04 100644
--- a/trunk/sound/core/timer.c
+++ b/trunk/sound/core/timer.c
@@ -328,6 +328,8 @@ int snd_timer_close(struct snd_timer_instance *timeri)
 		mutex_unlock(&register_mutex);
 	} else {
 		timer = timeri->timer;
+		if (snd_BUG_ON(!timer))
+			goto out;
 		/* wait, until the active callback is finished */
 		spin_lock_irq(&timer->lock);
 		while (timeri->flags & SNDRV_TIMER_IFLG_CALLBACK) {
@@ -353,6 +355,7 @@ int snd_timer_close(struct snd_timer_instance *timeri)
 		}
 		mutex_unlock(&register_mutex);
 	}
+ out:
 	if (timeri->private_free)
 		timeri->private_free(timeri);
 	kfree(timeri->owner);