Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[mv-sheeva.git] / sound / core / rtctimer.c

diff --git a/sound/core/rtctimer.c b/sound/core/rtctimer.c
index 84704ccb1829385416f28d7dbcc0a3ad2a5d5e9e..412dd62b654ec2907b3108df5415b0697032e29c 100644 (file)
--- a/sound/core/rtctimer.c
+++ b/sound/core/rtctimer.c
@@ -156,7 +156,7 @@ static int __init rtctimer_init(void)
 static void __exit rtctimer_exit(void)
 {
        if (rtctimer) {
-               snd_timer_global_unregister(rtctimer);
+               snd_timer_global_free(rtctimer);
                rtctimer = NULL;
        }
 }