diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-15 03:32:39 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 10:15:50 -0500 |
commit | 5f2a71fcb7995633b335a1e380ac63a968e61320 (patch) | |
tree | d47f4227d314fc9f298b75c217fa78440004e6e7 /drivers/serial/serial_cs.c | |
parent | 1de9cedfbdff1d8adb662cd3afc5bda66e393351 (diff) |
[PATCH] pcmcia: add pcmcia_disable_device
pcmcia_disable_device(struct pcmcia_device *p_dev) performs the necessary
cleanups upon device or driver removal: it calls the appropriate
pcmcia_release_* functions, and can replace (most) of the current drivers'
_release() functions.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/serial/serial_cs.c')
-rw-r--r-- | drivers/serial/serial_cs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 2307d9407a49..ff38820a03f5 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -141,11 +141,8 @@ static void serial_remove(dev_link_t *link) | |||
141 | 141 | ||
142 | info->link.dev = NULL; | 142 | info->link.dev = NULL; |
143 | 143 | ||
144 | if (!info->slave) { | 144 | if (!info->slave) |
145 | pcmcia_release_configuration(info->link.handle); | 145 | pcmcia_disable_device(link->handle); |
146 | pcmcia_release_io(info->link.handle, &info->link.io); | ||
147 | pcmcia_release_irq(info->link.handle, &info->link.irq); | ||
148 | } | ||
149 | 146 | ||
150 | info->link.state &= ~DEV_CONFIG; | 147 | info->link.state &= ~DEV_CONFIG; |
151 | } | 148 | } |