diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-02 11:34:09 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-17 12:30:49 -0500 |
commit | 180c33ee409eb3ed605d4ad9884e4a526a7655ff (patch) | |
tree | 0bb12fc08cc26eeef0deb51eb32372e791b0a896 /drivers/pcmcia/cs.c | |
parent | 57197b9b7712eb19f5344c466e8aefbac1adbe55 (diff) |
pcmcia: call CIS cleanup from ds.c
As ds.c is the only real user of CIS access functions, call the
cleanup functions from ds.c, too.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/cs.c')
-rw-r--r-- | drivers/pcmcia/cs.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 8c51493d1f95..9d8b9c1f5a69 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c | |||
@@ -283,8 +283,6 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket) | |||
283 | if (socket->thread) | 283 | if (socket->thread) |
284 | kthread_stop(socket->thread); | 284 | kthread_stop(socket->thread); |
285 | 285 | ||
286 | release_cis_mem(socket); | ||
287 | |||
288 | /* remove from our own list */ | 286 | /* remove from our own list */ |
289 | down_write(&pcmcia_socket_list_rwsem); | 287 | down_write(&pcmcia_socket_list_rwsem); |
290 | list_del(&socket->socket_list); | 288 | list_del(&socket->socket_list); |
@@ -399,7 +397,6 @@ static void socket_shutdown(struct pcmcia_socket *s) | |||
399 | s->ops->set_socket(s, &s->socket); | 397 | s->ops->set_socket(s, &s->socket); |
400 | s->irq.AssignedIRQ = s->irq.Config = 0; | 398 | s->irq.AssignedIRQ = s->irq.Config = 0; |
401 | s->lock_count = 0; | 399 | s->lock_count = 0; |
402 | destroy_cis_cache(s); | ||
403 | kfree(s->fake_cis); | 400 | kfree(s->fake_cis); |
404 | s->fake_cis = NULL; | 401 | s->fake_cis = NULL; |
405 | #ifdef CONFIG_CARDBUS | 402 | #ifdef CONFIG_CARDBUS |