aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hardware
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-01-15 10:05:19 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 17:15:51 +0200
commit50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7 (patch)
treea3cd6076787d9c55467fcc598c997726315f80d1 /drivers/isdn/hardware
parent5f2a71fcb7995633b335a1e380ac63a968e61320 (diff)
downloadkernel_samsung_tuna-50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7.zip
kernel_samsung_tuna-50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7.tar.gz
kernel_samsung_tuna-50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7.tar.bz2
[PATCH] pcmcia: convert remaining users of pcmcia_release_io and _irq
Convert the remaining drivers which use pcmcia_release_io or pcmcia_release_irq, and remove the EXPORT of these symbols. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/isdn/hardware')
-rw-r--r--drivers/isdn/hardware/avm/avm_cs.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index f3889bd..5f70661 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -284,25 +284,25 @@ found_port:
cs_error(link->handle, RequestIO, i);
break;
}
-
+
/*
* allocate an interrupt line
*/
i = pcmcia_request_irq(link->handle, &link->irq);
if (i != CS_SUCCESS) {
cs_error(link->handle, RequestIRQ, i);
- pcmcia_release_io(link->handle, &link->io);
+ /* undo */
+ pcmcia_disable_device(link->handle);
break;
}
-
+
/*
* configure the PCMCIA socket
*/
i = pcmcia_request_configuration(link->handle, &link->conf);
if (i != CS_SUCCESS) {
cs_error(link->handle, RequestConfiguration, i);
- pcmcia_release_io(link->handle, &link->io);
- pcmcia_release_irq(link->handle, &link->irq);
+ pcmcia_disable_device(link->handle);
break;
}