saner FASYNC handling on file close

[linux-2.6-omap-h63xx.git] / sound / core / timer.c

diff --git a/sound/core/timer.c b/sound/core/timer.c
index b8ee49c1f8552a1b44394d2b0baf3b4e3ed10f2a..c584408c9f17d32dcace6b8684bfe02647a0f228 100644 (file)
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -306,7 +306,7 @@ int snd_timer_close(struct snd_timer_instance *timeri)
        struct snd_timer *timer = NULL;
        struct snd_timer_instance *slave, *tmp;
 
-       if (snd_BUG_ON(!timer))
+       if (snd_BUG_ON(!timeri))
                return -ENXIO;
 
        /* force to stop the timer */
@@ -1263,7 +1263,6 @@ static int snd_timer_user_release(struct inode *inode, struct file *file)
        if (file->private_data) {
                tu = file->private_data;
                file->private_data = NULL;
-               fasync_helper(-1, file, 0, &tu->fasync);
                if (tu->timeri)
                        snd_timer_close(tu->timeri);
                kfree(tu->queue);