51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
tree 353750772b10adbfa8eed9a09fea94b72f8f55ad
|
|
parent 3e23c658833f135508127c955d40d7c9387f71dd
|
|
author Takashi Iwai <tiwai@suse.de> Tue, 03 Jan 2006 19:56:55 +0100
|
|
committer Jaroslav Kysela <perex@suse.cz> Wed, 04 Jan 2006 10:13:52 +0100
|
|
|
|
[ALSA] opl3 - Fix the unreleased resources
|
|
|
|
Modules: OPL3
|
|
|
|
Fix the unreleased resources in the error path of snd_opl3_create().
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
|
|
sound/drivers/opl3/opl3_lib.c | 6 +++---
|
|
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
|
|
index 650f3b8..1e0c76b 100644
|
|
--- a/sound/drivers/opl3/opl3_lib.c
|
|
+++ b/sound/drivers/opl3/opl3_lib.c
|
|
@@ -407,13 +407,13 @@ int snd_opl3_create(struct snd_card *car
|
|
if (! integrated) {
|
|
if ((opl3->res_l_port = request_region(l_port, 2, "OPL2/3 (left)")) == NULL) {
|
|
snd_printk(KERN_ERR "opl3: can't grab left port 0x%lx\n", l_port);
|
|
- snd_opl3_free(opl3);
|
|
+ snd_device_free(card, opl3);
|
|
return -EBUSY;
|
|
}
|
|
if (r_port != 0 &&
|
|
(opl3->res_r_port = request_region(r_port, 2, "OPL2/3 (right)")) == NULL) {
|
|
snd_printk(KERN_ERR "opl3: can't grab right port 0x%lx\n", r_port);
|
|
- snd_opl3_free(opl3);
|
|
+ snd_device_free(card, opl3);
|
|
return -EBUSY;
|
|
}
|
|
}
|
|
@@ -432,7 +432,7 @@ int snd_opl3_create(struct snd_card *car
|
|
if ((err = snd_opl3_detect(opl3)) < 0) {
|
|
snd_printd("OPL2/3 chip not detected at 0x%lx/0x%lx\n",
|
|
opl3->l_port, opl3->r_port);
|
|
- snd_opl3_free(opl3);
|
|
+ snd_device_free(card, opl3);
|
|
return err;
|
|
}
|
|
/* detect routine returns correct hardware type */
|
|
-
|
|
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
|
|
the body of a message to majordomo@vger.kernel.org
|
|
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
|
|