1 files changed, 28 insertions, 6 deletions

diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index a0e4a033e2db..0fe5869d7d4c 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -93,12 +93,6 @@ static struct attribute_group psmouse_attribute_group = {
         .attrs  = psmouse_attributes,
 };
 
-__obsolete_setup("psmouse_noext");
-__obsolete_setup("psmouse_resolution=");
-__obsolete_setup("psmouse_smartscroll=");
-__obsolete_setup("psmouse_resetafter=");
-__obsolete_setup("psmouse_rate=");
-
 /*
  * psmouse_mutex protects all operations changing state of mouse
  * (connecting, disconnecting, changing rate or resolution via
@@ -987,8 +981,36 @@ static void psmouse_resync(struct work_struct *work)
 static void psmouse_cleanup(struct serio *serio)
 {
         struct psmouse *psmouse = serio_get_drvdata(serio);
+        struct psmouse *parent = NULL;
+
+        mutex_lock(&psmouse_mutex);
+
+        if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
+                parent = serio_get_drvdata(serio->parent);
+                psmouse_deactivate(parent);
+        }
+
+        psmouse_deactivate(psmouse);
+
+        if (psmouse->cleanup)
+                psmouse->cleanup(psmouse);
 
         psmouse_reset(psmouse);
+
+/*
+ * Some boxes, such as HP nx7400, get terribly confused if mouse
+ * is not fully enabled before suspending/shutting down.
+ */
+        ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE);
+
+        if (parent) {
+                if (parent->pt_deactivate)
+                        parent->pt_deactivate(parent);
+
+                psmouse_activate(parent);
+        }
+
+        mutex_unlock(&psmouse_mutex);
 }
 
 /*