---

yaml --- r: 262681 b: refs/heads/master c: 94094c8 h: refs/heads/master i: 262679: 91e6977 v: v3
git-mirror · Aug 8, 2011 · 9b9f94d · 9b9f94d
1 parent baa4780
commit 9b9f94d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);