From fc5f002c0c68dee62ad505350c6b747042b1d3ec Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sat, 2 Jan 2010 23:19:45 +0100
Subject: [PATCH] --- yaml --- r: 181973 b: refs/heads/master c:
 3970dd8c5169505f0cc5e4c3e2fde7bdd9bbad3e h: refs/heads/master i:   181971:
 431df04cad58e781d51e382383087d0f494d0708 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/pcmcia/cs.c          | 13 ++++++++++---
 trunk/drivers/pcmcia/cs_internal.h | 20 --------------------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 89fcb0d1e455..78c0f4abd93a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 593f010bc0d8f7fde2ce948cac3f77f6a3d9db2b
+refs/heads/master: 3970dd8c5169505f0cc5e4c3e2fde7bdd9bbad3e
diff --git a/trunk/drivers/pcmcia/cs.c b/trunk/drivers/pcmcia/cs.c
index f0630a61da90..137a5db2eca2 100644
--- a/trunk/drivers/pcmcia/cs.c
+++ b/trunk/drivers/pcmcia/cs.c
@@ -407,7 +407,7 @@ static void socket_shutdown(struct pcmcia_socket *s)
 			   "*** DANGER *** unable to remove socket power\n");
 	}
 
-	cs_socket_put(s);
+	s->state &= ~SOCKET_INUSE;
 }
 
 static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
@@ -496,8 +496,8 @@ static int socket_insert(struct pcmcia_socket *skt)
 
 	dev_dbg(&skt->dev, "insert\n");
 
-	if (!cs_socket_get(skt))
-		return -ENODEV;
+	WARN_ON(skt->state & SOCKET_INUSE);
+	skt->state |= SOCKET_INUSE;
 
 	ret = socket_setup(skt, setup_delay);
 	if (ret == 0) {
@@ -697,6 +697,13 @@ static int pccardd(void *__skt)
 	/* make sure we are running before we exit */
 	set_current_state(TASK_RUNNING);
 
+	/* shut down socket, if a device is still present */
+	if (skt->state & SOCKET_PRESENT) {
+		mutex_lock(&skt->skt_mutex);
+		socket_remove(skt);
+		mutex_unlock(&skt->skt_mutex);
+	}
+
 	/* remove from the device core */
 	pccard_sysfs_remove_socket(&skt->dev);
 	device_unregister(&skt->dev);
diff --git a/trunk/drivers/pcmcia/cs_internal.h b/trunk/drivers/pcmcia/cs_internal.h
index 3bc02d53a3a3..9a3bbad7761b 100644
--- a/trunk/drivers/pcmcia/cs_internal.h
+++ b/trunk/drivers/pcmcia/cs_internal.h
@@ -87,26 +87,6 @@ struct pccard_resource_ops {
 #define SOCKET_CARDBUS		0x8000
 #define SOCKET_CARDBUS_CONFIG	0x10000
 
-static inline int cs_socket_get(struct pcmcia_socket *skt)
-{
-	int ret;
-
-	WARN_ON(skt->state & SOCKET_INUSE);
-
-	ret = try_module_get(skt->owner);
-	if (ret)
-		skt->state |= SOCKET_INUSE;
-	return ret;
-}
-
-static inline void cs_socket_put(struct pcmcia_socket *skt)
-{
-	if (skt->state & SOCKET_INUSE) {
-		skt->state &= ~SOCKET_INUSE;
-		module_put(skt->owner);
-	}
-}
-
 
 /*
  * Stuff internal to module "pcmcia_core":