projects
/
linux-flexiantxendom0-natty.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
UBUNTU: SAUCE: Unregister input device only if it is registered
[linux-flexiantxendom0-natty.git]
/
drivers
/
input
/
mouse
/
alps.c
diff --git
a/drivers/input/mouse/alps.c
b/drivers/input/mouse/alps.c
index
da20b62
..
9adff60
100644
(file)
--- 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);
}