diff options
| author | Jesse Sung <jesse.sung@canonical.com> | 2011-09-19 09:25:14 +0800 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-10-17 09:57:14 -0600 |
| commit | b6fde2232bf7ab232670814e122177a2599be0f9 (patch) | |
| tree | b10a83a5768a2c0f4cbaf44ad2a9442afddc98ee | |
| parent | 434912ef2d9d126b3e4aff4d4f71a9c87d31661e (diff) | |
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>
| -rw-r--r-- | drivers/input/mouse/alps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index da20b627ebd..9adff607f86 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); } |