Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

1 files changed, 1 insertions, 4 deletions

diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index 3a25c89d2983..e9d52c668edc 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -717,10 +717,7 @@ static void free_mtpav(mtpav_t * crd)
         spin_unlock_irqrestore(&crd->spinlock, flags);
         if (crd->irq >= 0)
                 free_irq(crd->irq, (void *)crd);
-        if (crd->res_port) {
-                release_resource(crd->res_port);
-                kfree_nocheck(crd->res_port);
-        }
+        release_and_free_resource(crd->res_port);
         kfree(crd);
 }