aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pcmcia
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pcmcia')
-rw-r--r--sound/pcmcia/pdaudiocf/pdaudiocf.c4
-rw-r--r--sound/pcmcia/vx/vxpocket.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index a2d3eb47f83c..80c53553b815 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -273,9 +273,7 @@ static void pdacf_config(dev_link_t *link)
273cs_failed: 273cs_failed:
274 cs_error(link->handle, last_fn, last_ret); 274 cs_error(link->handle, last_fn, last_ret);
275failed: 275failed:
276 pcmcia_release_configuration(link->handle); 276 pcmcia_disable_device(link->handle);
277 pcmcia_release_io(link->handle, &link->io);
278 pcmcia_release_irq(link->handle, &link->irq);
279} 277}
280 278
281#ifdef CONFIG_PM 279#ifdef CONFIG_PM
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index 92788744bc48..8093e5044956 100644
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -272,10 +272,7 @@ static void vxpocket_config(dev_link_t *link)
272cs_failed: 272cs_failed:
273 cs_error(link->handle, last_fn, last_ret); 273 cs_error(link->handle, last_fn, last_ret);
274failed: 274failed:
275 pcmcia_release_configuration(link->handle); 275 pcmcia_disable_device(link->handle);
276 pcmcia_release_io(link->handle, &link->io);
277 pcmcia_release_irq(link->handle, &link->irq);
278 link->state &= ~DEV_CONFIG;
279 kfree(parse); 276 kfree(parse);
280} 277}
281 278