Merge git://git.tuxdriver.com/git/netdev-jwl

[linux-2.6-omap-h63xx.git] / sound / drivers / opl3 / opl3_lib.c

diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
index 1f84d78260dea71d15e27d5859d7b673e1d4e621..06246503083c01b201831ac3d2f3bb53215725ab 100644 (file)
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
@@ -325,14 +325,8 @@ static int snd_opl3_free(opl3_t *opl3)
        snd_assert(opl3 != NULL, return -ENXIO);
        if (opl3->private_free)
                opl3->private_free(opl3);
-       if (opl3->res_l_port) {
-               release_resource(opl3->res_l_port);
-               kfree_nocheck(opl3->res_l_port);
-       }
-       if (opl3->res_r_port) {
-               release_resource(opl3->res_r_port);
-               kfree_nocheck(opl3->res_r_port);
-       }
+       release_and_free_resource(opl3->res_l_port);
+       release_and_free_resource(opl3->res_r_port);
        kfree(opl3);
        return 0;
 }