1 files changed, 21 insertions, 6 deletions

diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index da1c9909eb44..d606a163b1d7 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -5,6 +5,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/ctype.h>
 #include <linux/slab.h>
 #include <linux/pnp.h>
 #include "base.h"
@@ -100,19 +101,33 @@ static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv)
  * @id: pointer to a pnp_id structure
  * @card: pointer to the desired card
  */
-int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card)
+struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id)
 {
-        struct pnp_id *ptr;
+        struct pnp_id *dev_id, *ptr;
 
-        id->next = NULL;
+        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
+        if (!dev_id)
+                return NULL;
+
+        dev_id->id[0] = id[0];
+        dev_id->id[1] = id[1];
+        dev_id->id[2] = id[2];
+        dev_id->id[3] = tolower(id[3]);
+        dev_id->id[4] = tolower(id[4]);
+        dev_id->id[5] = tolower(id[5]);
+        dev_id->id[6] = tolower(id[6]);
+        dev_id->id[7] = '\0';
+
+        dev_id->next = NULL;
         ptr = card->id;
         while (ptr && ptr->next)
                 ptr = ptr->next;
         if (ptr)
-                ptr->next = id;
+                ptr->next = dev_id;
         else
-                card->id = id;
-        return 0;
+                card->id = dev_id;
+
+        return dev_id;
 }
 
 static void pnp_free_card_ids(struct pnp_card *card)