diff options
| author | Jesse Sung <jesse.sung@canonical.com> | 2011-09-18 21:25:14 -0400 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-09-19 09:31:41 -0400 |
| commit | d6690911d682d52920ba424ca80073a9336f69ba (patch) | |
| tree | c9e1286732853ad94505e9ab6152f6b5c2168342 /drivers/input/mouse/alps.c | |
| parent | 5467d607119bd005b04cb1bfd7d78d5665057d81 (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>
Diffstat (limited to 'drivers/input/mouse/alps.c')
| -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) | |||
| 745 | 745 | ||
| 746 | psmouse_reset(psmouse); | 746 | psmouse_reset(psmouse); |
| 747 | del_timer_sync(&priv->timer); | 747 | del_timer_sync(&priv->timer); |
| 748 | input_unregister_device(priv->dev2); | 748 | if (!alps_model_quirk_enabled) |
| 749 | input_unregister_device(priv->dev2); | ||
| 749 | kfree(priv); | 750 | kfree(priv); |
| 750 | } | 751 | } |
| 751 | 752 | ||
