3 files changed, 31 insertions, 11 deletions

diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 37f7d85fc4bc..a83cdcfee165 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -3,6 +3,7 @@ void *pnp_alloc(long size);
 #define PNP_EISA_ID_MASK 0x7fffffff
 void pnp_eisa_id_to_string(u32 id, char *str);
 struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid);
+struct pnp_card *pnp_alloc_card(struct pnp_protocol *, int id, char *pnpid);
 struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
 struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id);
 int pnp_interface_attach_device(struct pnp_dev *dev);
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index d606a163b1d7..a762a4176736 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -151,6 +151,31 @@ static void pnp_release_card(struct device *dmdev)
         kfree(card);
 }
 
+struct pnp_card *pnp_alloc_card(struct pnp_protocol *protocol, int id, char *pnpid)
+{
+        struct pnp_card *card;
+        struct pnp_id *dev_id;
+
+        card = kzalloc(sizeof(struct pnp_card), GFP_KERNEL);
+        if (!card)
+                return NULL;
+
+        card->protocol = protocol;
+        card->number = id;
+
+        card->dev.parent = &card->protocol->dev;
+        sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number,
+                card->number);
+
+        dev_id = pnp_add_card_id(card, pnpid);
+        if (!dev_id) {
+                kfree(card);
+                return NULL;
+        }
+
+        return card;
+}
+
 static ssize_t pnp_show_card_name(struct device *dmdev,
                                   struct device_attribute *attr, char *buf)
 {
@@ -206,9 +231,6 @@ int pnp_add_card(struct pnp_card *card)
         int error;
         struct list_head *pos, *temp;
 
-        sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number,
-                card->number);
-        card->dev.parent = &card->protocol->dev;
         card->dev.bus = NULL;
         card->dev.release = &pnp_release_card;
         error = device_register(&card->dev);
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 3a326f9305f6..883577a93d6a 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -840,16 +840,14 @@ static int __init isapnp_build_device_list(void)
                        header[5], header[6], header[7], header[8]);
                 printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
 #endif
-                if ((card =
-                     kzalloc(sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
-                        continue;
-
-                card->number = csn;
-                INIT_LIST_HEAD(&card->devices);
                 eisa_id = header[0] | header[1] << 8 |
                           header[2] << 16 | header[3] << 24;
                 pnp_eisa_id_to_string(eisa_id, id);
-                pnp_add_card_id(card, id);
+                card = pnp_alloc_card(&isapnp_protocol, csn, id);
+                if (!card)
+                        continue;
+
+                INIT_LIST_HEAD(&card->devices);
                 card->serial =
                     (header[7] << 24) | (header[6] << 16) | (header[5] << 8) |
                     header[4];
@@ -860,7 +858,6 @@ static int __init isapnp_build_device_list(void)
                                "isapnp: checksum for device %i is not valid (0x%x)\n",
                                csn, isapnp_checksum_value);
                 card->checksum = isapnp_checksum_value;
-                card->protocol = &isapnp_protocol;
 
                 pnp_add_card(card);
         }