summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArief Mulya Utama <arief_m_utama@telkomsel.co.id>2003-12-18 05:33:41 -0800
committerDmitry Torokhov <dtor_core@ameritech.net>2003-12-18 05:33:41 -0800
commitf5af7c4ce2fb4b29b84c8a1515526f44ca36a28a (patch)
treeed38e70af3f70ead2c29deeb605b838fc958b08e
parent39e00ca1ac443d1d251edc35a8f936a63793083a (diff)
[PATCH] psmouse pm resume fix
I just want to share a little change that I've did to psmouse_pm_callback() which without this, my synaptics touchpad would prevent my laptop (IBM Thinkpad T30) from suspending.
-rw-r--r--drivers/input/mouse/psmouse-base.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index a53cd816deaa..c225debf3581 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -533,9 +533,10 @@ static int psmouse_pm_callback(struct pm_dev *dev, pm_request_t request, void *d
{
struct psmouse *psmouse = dev->data;
- psmouse->state = PSMOUSE_IGNORE;
- serio_reconnect(psmouse->serio);
-
+ if (request == PM_RESUME) {
+ psmouse->state = PSMOUSE_IGNORE;
+ serio_reconnect(psmouse->serio);
+ }
return 0;
}