summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-02 17:34:09 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2010-01-17 18:30:49 +0100
commit180c33ee409eb3ed605d4ad9884e4a526a7655ff (patch)
tree0bb12fc08cc26eeef0deb51eb32372e791b0a896 /drivers/pcmcia/cs.c
parent57197b9b7712eb19f5344c466e8aefbac1adbe55 (diff)
downloadlinux-180c33ee409eb3ed605d4ad9884e4a526a7655ff.tar.bz2
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.c3
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)
if (socket->thread)
kthread_stop(socket->thread);
- release_cis_mem(socket);
-
/* remove from our own list */
down_write(&pcmcia_socket_list_rwsem);
list_del(&socket->socket_list);
@@ -399,7 +397,6 @@ static void socket_shutdown(struct pcmcia_socket *s)
s->ops->set_socket(s, &s->socket);
s->irq.AssignedIRQ = s->irq.Config = 0;
s->lock_count = 0;
- destroy_cis_cache(s);
kfree(s->fake_cis);
s->fake_cis = NULL;
#ifdef CONFIG_CARDBUS