From d34dd9f2889a36db8ca4d66cc5677ae2195fa04b Mon Sep 17 00:00:00 2001 From: Jesse Sung Date: Mon, 19 Sep 2011 09:25:14 +0800 Subject: [PATCH] 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 Acked-by: Tim Gardner Signed-off-by: Leann Ogasawara --- drivers/input/mouse/alps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); } -- 1.7.10.4