From 057ce306618ec64c70b7c235aaa03c4ee57fae14 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@suse.cz>
Date: Thu, 18 Aug 2005 13:16:11 +0200
Subject: [PATCH] --- yaml --- r: 5862 b: refs/heads/master c:
 30d5b64b63fa69af31b2cba32e6d71d68526eec9 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/pnp/card.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b4613bb2043e..6c6c9ee13a0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 518e6540831c69422faecceee8f964bd439ac9d0
+refs/heads/master: 30d5b64b63fa69af31b2cba32e6d71d68526eec9
diff --git a/trunk/drivers/pnp/card.c b/trunk/drivers/pnp/card.c
index add12f7c489a..6e5229e92fbc 100644
--- a/trunk/drivers/pnp/card.c
+++ b/trunk/drivers/pnp/card.c
@@ -312,6 +312,8 @@ struct pnp_dev * pnp_request_card_device(struct pnp_card_link *clink, const char
 	if (drv->link.driver.probe) {
 		if (drv->link.driver.probe(&dev->dev)) {
 			dev->dev.driver = NULL;
+			dev->card_link = NULL;
+			up_write(&dev->dev.bus->subsys.rwsem);
 			return NULL;
 		}
 	}