1 files changed, 33 insertions, 7 deletions

diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 8bc61237bc1b..27057df7ba74 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -474,19 +474,45 @@ static int psmouse_poll(struct psmouse *psmouse)
                            PSMOUSE_CMD_POLL | (psmouse->pktsize << 8));
 }
 
+static bool psmouse_check_pnp_id(const char *id, const char * const ids[])
+{
+        int i;
+
+        for (i = 0; ids[i]; i++)
+                if (!strcasecmp(id, ids[i]))
+                        return true;
+
+        return false;
+}
+
 /*
  * psmouse_matches_pnp_id - check if psmouse matches one of the passed in ids.
  */
 bool psmouse_matches_pnp_id(struct psmouse *psmouse, const char * const ids[])
 {
-        int i;
-
-        if (!strncmp(psmouse->ps2dev.serio->firmware_id, "PNP:", 4))
-                for (i = 0; ids[i]; i++)
-                        if (strstr(psmouse->ps2dev.serio->firmware_id, ids[i]))
-                                return true;
+        struct serio *serio = psmouse->ps2dev.serio;
+        char *p, *fw_id_copy, *save_ptr;
+        bool found = false;
+
+        if (strncmp(serio->firmware_id, "PNP: ", 5))
+                return false;
+
+        fw_id_copy = kstrndup(&serio->firmware_id[5],
+                              sizeof(serio->firmware_id) - 5,
+                              GFP_KERNEL);
+        if (!fw_id_copy)
+                return false;
+
+        save_ptr = fw_id_copy;
+        while ((p = strsep(&fw_id_copy, " ")) != NULL) {
+                if (psmouse_check_pnp_id(p, ids)) {
+                        found = true;
+                        break;
+                }
+        }
 
-        return false;
+        kfree(save_ptr);
+        return found;
 }
 
 /*