Merge branch 'master'

[linux-2.6-omap-h63xx.git] / sound / isa / cs423x / cs4236.c

diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index d28315dc72f7d543a01c24622a666bd6ba6cf381..d60a55e6a0b18afdf9b89f42ea98b9bc154e578c 100644 (file)
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -379,12 +379,8 @@ static void snd_card_cs4236_free(snd_card_t *card)
 {
        struct snd_card_cs4236 *acard = (struct snd_card_cs4236 *)card->private_data;
 
-       if (acard) {
-               if (acard->res_sb_port) {
-                       release_resource(acard->res_sb_port);
-                       kfree_nocheck(acard->res_sb_port);
-               }
-       }
+       if (acard)
+               release_and_free_resource(acard->res_sb_port);
 }
 
 #ifdef CONFIG_PNP