From da64084cb7fd2552f7fd7dbcf2e93e93facf07cd Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 27 Mar 2006 13:42:39 +0200 Subject: [PATCH] --- yaml --- r: 25253 b: refs/heads/master c: 10d150e186d069cc7e2075c4823049949933777c h: refs/heads/master i: 25251: 9ab5278c7d9f62b59ca786f8f733939769f0450a v: v3 --- [refs] | 2 +- trunk/sound/isa/opti9xx/miro.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f944d95062e1..6428b49b950f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3a70d5ece60684c00d7d94ccc42741efdf99336 +refs/heads/master: 10d150e186d069cc7e2075c4823049949933777c diff --git a/trunk/sound/isa/opti9xx/miro.c b/trunk/sound/isa/opti9xx/miro.c index 49ba334c0d24..09384d03dc31 100644 --- a/trunk/sound/isa/opti9xx/miro.c +++ b/trunk/sound/isa/opti9xx/miro.c @@ -743,8 +743,7 @@ static long snd_legacy_find_free_ioport(long *port_table, long size) struct resource *res; if ((res = request_region(*port_table, size, "ALSA test")) != NULL) { - release_resource(res); - kfree_nocheck(res); + release_and_free_resource(res); return *port_table; } port_table++; @@ -1150,8 +1149,7 @@ static int __init snd_card_miro_detect(struct snd_card *card, struct snd_miro *c if (value == snd_miro_read(chip, OPTi9XX_MC_REG(1))) return 1; - release_resource(chip->res_mc_base); - kfree_nocheck(chip->res_mc_base); + release_and_free_resource(chip->res_mc_base); chip->res_mc_base = NULL; }