diff --git a/[refs] b/[refs]
index a61c80abc6e5..6d0bf683b56b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e457ef667158840c1be511f5d10dd42c6dbbe46
+refs/heads/master: 220ec0291130a932b32b2c66a10e9c5019dab702
diff --git a/trunk/drivers/pcmcia/cs.c b/trunk/drivers/pcmcia/cs.c
index fabd3529cebc..d5e76423a0ee 100644
--- a/trunk/drivers/pcmcia/cs.c
+++ b/trunk/drivers/pcmcia/cs.c
@@ -689,6 +689,9 @@ static int pccardd(void *__skt)
 		schedule();
 		try_to_freeze();
 	}
+	/* make sure we are running before we exit */
+	set_current_state(TASK_RUNNING);
+
 	remove_wait_queue(&skt->thread_wait, &wait);
 
 	/* remove from the device core */