From: Jesse Sung <jesse.sung@canonical.com>
Date: Mon, 19 Sep 2011 01:25:14 +0000 (+0800)
Subject: UBUNTU: SAUCE: Unregister input device only if it is registered
X-Git-Url: http://git.alex.org.uk

UBUNTU: SAUCE: Unregister input device only if it is registered

BugLink: https://bugs.launchpad.net/bugs/839238

dev2 is not registered in alps_model_quirk_enabled mode, do not
unregister while disconnecting.

Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index da20b62..9adff60 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -745,7 +745,8 @@ static void alps_disconnect(struct psmouse *psmouse)
 
 	psmouse_reset(psmouse);
 	del_timer_sync(&priv->timer);
-	input_unregister_device(priv->dev2);
+	if (!alps_model_quirk_enabled)
+		input_unregister_device(priv->dev2);
 	kfree(priv);
 }