Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[powerpc.git] / sound / isa / sb / sb16.c

diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 7888783..c2fa451 100644 (file)
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -345,10 +345,7 @@ static void snd_sb16_free(snd_card_t *card)
         
        if (acard == NULL)
                return;
-       if (acard->fm_res) {
-               release_resource(acard->fm_res);
-               kfree_nocheck(acard->fm_res);
-       }
+       release_and_free_resource(acard->fm_res);
 }
 
 #ifdef CONFIG_PNP