commit 94094c8aaeded11f8b99734b9ebdaada20b5f24a
author Takashi Iwai <tiwai@suse.de> Mon Aug 08 12:28:22 2011 +0200
committer Takashi Iwai <tiwai@suse.de> Mon Aug 08 12:28:22 2011 +0200
tree 292f1239564ff849b075632cb84a71a9aaae0981
parent 0584ffa548b6e59aceb027112f23a55f0133400e

ALSA: timer - Add NULL-check for invalid slave timer

Just to be sure.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

sound/core/timer.c

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 950eed0..67ebf1c 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -328,6 +328,8 @@
 		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 @@
 		}
 		mutex_unlock(&register_mutex);
 	}
+ out:
 	if (timeri->private_free)
 		timeri->private_free(timeri);
 	kfree(timeri->owner);