projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0584ffa
)
ALSA: timer - Add NULL-check for invalid slave timer
author
Takashi Iwai
<tiwai@suse.de>
Mon, 8 Aug 2011 10:28:22 +0000
(12:28 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 8 Aug 2011 10:28:22 +0000
(12:28 +0200)
Just to be sure.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/timer.c
patch
|
blob
|
history
diff --git
a/sound/core/timer.c
b/sound/core/timer.c
index
950eed0
..
67ebf1c
100644
(file)
--- a/
sound/core/timer.c
+++ b/
sound/core/timer.c
@@
-328,6
+328,8
@@
int snd_timer_close(struct snd_timer_instance *timeri)
mutex_unlock(®ister_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(®ister_mutex);
}
+ out:
if (timeri->private_free)
timeri->private_free(timeri);
kfree(timeri->owner);