diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-08-24 01:57:00 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-08-24 02:07:51 -0400 |
commit | 66fd9385ee9c582ee88031ba5028748cb38c986d (patch) | |
tree | 2bd11a7ddd9ca8041ee8d3d7baf7be086eae8072 /drivers/input/touchscreen | |
parent | e9496746cc0954c43720de0c88fef95a9d229baa (diff) |
Input: wacom_w8001 - simplify w8001_remove
Since touchscreen driver does not handle any events to be sent to the
device we can close serio port first and then unregister the input device.
Tested-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r-- | drivers/input/touchscreen/wacom_w8001.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c index 5ece6c1f3296..1f42d91f755b 100644 --- a/drivers/input/touchscreen/wacom_w8001.c +++ b/drivers/input/touchscreen/wacom_w8001.c | |||
@@ -499,12 +499,12 @@ static void w8001_disconnect(struct serio *serio) | |||
499 | { | 499 | { |
500 | struct w8001 *w8001 = serio_get_drvdata(serio); | 500 | struct w8001 *w8001 = serio_get_drvdata(serio); |
501 | 501 | ||
502 | input_get_device(w8001->dev); | ||
503 | input_unregister_device(w8001->dev); | ||
504 | serio_close(serio); | 502 | serio_close(serio); |
505 | serio_set_drvdata(serio, NULL); | 503 | |
506 | input_put_device(w8001->dev); | 504 | input_unregister_device(w8001->dev); |
507 | kfree(w8001); | 505 | kfree(w8001); |
506 | |||
507 | serio_set_drvdata(serio, NULL); | ||
508 | } | 508 | } |
509 | 509 | ||
510 | /* | 510 | /* |