2 files changed, 3 insertions, 12 deletions

diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 8f2872f8e8f6..5fd374f052ec 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -113,14 +113,8 @@ static int snd_gus_free(snd_gus_card_t *gus)
         snd_gf1_stop(gus);
         snd_gus_init_dma_irq(gus, 0);
       __hw_end:
-        if (gus->gf1.res_port1) {
-                release_resource(gus->gf1.res_port1);
-                kfree_nocheck(gus->gf1.res_port1);
-        }
-        if (gus->gf1.res_port2) {
-                release_resource(gus->gf1.res_port2);
-                kfree_nocheck(gus->gf1.res_port2);
-        }
+        release_and_free_resource(gus->gf1.res_port1);
+        release_and_free_resource(gus->gf1.res_port2);
         if (gus->gf1.irq >= 0)
                 free_irq(gus->gf1.irq, (void *) gus);
         if (gus->gf1.dma1 >= 0) {
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index 358cba9d738f..b101ab0a0dbf 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -638,10 +638,7 @@ static void snd_interwave_free(snd_card_t *card)
         if (iwcard == NULL)
                 return;
 #ifdef SNDRV_STB
-        if (iwcard->i2c_res) {
-                release_resource(iwcard->i2c_res);
-                kfree_nocheck(iwcard->i2c_res);
-        }
+        release_and_free_resource(iwcard->i2c_res);
 #endif
         if (iwcard->irq >= 0)
                 free_irq(iwcard->irq, (void *)iwcard);