diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-15 04:05:19 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 10:15:51 -0500 |
commit | 50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7 (patch) | |
tree | a3cd6076787d9c55467fcc598c997726315f80d1 /drivers/isdn/hisax/avma1_cs.c | |
parent | 5f2a71fcb7995633b335a1e380ac63a968e61320 (diff) |
[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/hisax/avma1_cs.c')
-rw-r--r-- | drivers/isdn/hisax/avma1_cs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c index 729c2de0bc1d..845fa14e1bae 100644 --- a/drivers/isdn/hisax/avma1_cs.c +++ b/drivers/isdn/hisax/avma1_cs.c | |||
@@ -313,18 +313,18 @@ found_port: | |||
313 | i = pcmcia_request_irq(link->handle, &link->irq); | 313 | i = pcmcia_request_irq(link->handle, &link->irq); |
314 | if (i != CS_SUCCESS) { | 314 | if (i != CS_SUCCESS) { |
315 | cs_error(link->handle, RequestIRQ, i); | 315 | cs_error(link->handle, RequestIRQ, i); |
316 | pcmcia_release_io(link->handle, &link->io); | 316 | /* undo */ |
317 | pcmcia_disable_device(link->handle); | ||
317 | break; | 318 | break; |
318 | } | 319 | } |
319 | 320 | ||
320 | /* | 321 | /* |
321 | * configure the PCMCIA socket | 322 | * configure the PCMCIA socket |
322 | */ | 323 | */ |
323 | i = pcmcia_request_configuration(link->handle, &link->conf); | 324 | i = pcmcia_request_configuration(link->handle, &link->conf); |
324 | if (i != CS_SUCCESS) { | 325 | if (i != CS_SUCCESS) { |
325 | cs_error(link->handle, RequestConfiguration, i); | 326 | cs_error(link->handle, RequestConfiguration, i); |
326 | pcmcia_release_io(link->handle, &link->io); | 327 | pcmcia_disable_device(link->handle); |
327 | pcmcia_release_irq(link->handle, &link->irq); | ||
328 | break; | 328 | break; |
329 | } | 329 | } |
330 | 330 | ||