From 28f4b6ccee42c472b354e43739c174cedb8157cf Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 6 Dec 2006 20:35:33 -0800
Subject: [PATCH] --- yaml --- r: 42767 b: refs/heads/master c:
 bfc7ee207078e8ca51264355805e6f56b485be4b h: refs/heads/master i:   42765:
 438d8135e43a6095a0f51c21125fd8987a16eb01   42763:
 7591996e2092bf3886e7d013ae08a747977056a6   42759:
 58cb65aaf53afd60b9eb0568b45106d6853bfef5   42751:
 a78ab0063a7ecff29ad9d8aa178a86971da8bfb7 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/pnp/card.c      | 30 +++++++++++++++++++++---------
 trunk/drivers/pnp/interface.c | 17 ++++++++++++++---
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 4cf59f6be329..958f678afdb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3889b26bebd3e3cf5a3b95da683bab2f6462133d
+refs/heads/master: bfc7ee207078e8ca51264355805e6f56b485be4b
diff --git a/trunk/drivers/pnp/card.c b/trunk/drivers/pnp/card.c
index 227600cd6360..91c047a7e635 100644
--- a/trunk/drivers/pnp/card.c
+++ b/trunk/drivers/pnp/card.c
@@ -164,9 +164,17 @@ static DEVICE_ATTR(card_id,S_IRUGO,pnp_show_card_ids,NULL);
 
 static int pnp_interface_attach_card(struct pnp_card *card)
 {
-	device_create_file(&card->dev,&dev_attr_name);
-	device_create_file(&card->dev,&dev_attr_card_id);
+	int rc = device_create_file(&card->dev,&dev_attr_name);
+	if (rc) return rc;
+
+	rc = device_create_file(&card->dev,&dev_attr_card_id);
+	if (rc) goto err_name;
+
 	return 0;
+
+err_name:
+	device_remove_file(&card->dev,&dev_attr_name);
+	return rc;
 }
 
 /**
@@ -306,16 +314,20 @@ struct pnp_dev * pnp_request_card_device(struct pnp_card_link *clink, const char
 	down_write(&dev->dev.bus->subsys.rwsem);
 	dev->card_link = clink;
 	dev->dev.driver = &drv->link.driver;
-	if (pnp_bus_type.probe(&dev->dev)) {
-		dev->dev.driver = NULL;
-		dev->card_link = NULL;
-		up_write(&dev->dev.bus->subsys.rwsem);
-		return NULL;
-	}
-	device_bind_driver(&dev->dev);
+	if (pnp_bus_type.probe(&dev->dev))
+		goto err_out;
+	if (device_bind_driver(&dev->dev))
+		goto err_out;
+
 	up_write(&dev->dev.bus->subsys.rwsem);
 
 	return dev;
+
+err_out:
+	dev->dev.driver = NULL;
+	dev->card_link = NULL;
+	up_write(&dev->dev.bus->subsys.rwsem);
+	return NULL;
 }
 
 /**
diff --git a/trunk/drivers/pnp/interface.c b/trunk/drivers/pnp/interface.c
index 9d8b415eca79..ac9fcd499f3f 100644
--- a/trunk/drivers/pnp/interface.c
+++ b/trunk/drivers/pnp/interface.c
@@ -461,8 +461,19 @@ static DEVICE_ATTR(id,S_IRUGO,pnp_show_current_ids,NULL);
 
 int pnp_interface_attach_device(struct pnp_dev *dev)
 {
-	device_create_file(&dev->dev,&dev_attr_options);
-	device_create_file(&dev->dev,&dev_attr_resources);
-	device_create_file(&dev->dev,&dev_attr_id);
+	int rc = device_create_file(&dev->dev,&dev_attr_options);
+	if (rc) goto err;
+	rc = device_create_file(&dev->dev,&dev_attr_resources);
+	if (rc) goto err_opt;
+	rc = device_create_file(&dev->dev,&dev_attr_id);
+	if (rc) goto err_res;
+
 	return 0;
+
+err_res:
+	device_remove_file(&dev->dev,&dev_attr_resources);
+err_opt:
+	device_remove_file(&dev->dev,&dev_attr_options);
+err:
+	return rc;
 }