summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/wacom_w8001.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-08-24 07:57:00 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-08-24 08:07:51 +0200
commit66fd9385ee9c582ee88031ba5028748cb38c986d (patch)
tree2bd11a7ddd9ca8041ee8d3d7baf7be086eae8072 /drivers/input/touchscreen/wacom_w8001.c
parentInput: wacom_w8001 - implement open and close (diff)
downloadlinux-66fd9385ee9c582ee88031ba5028748cb38c986d.tar.xz
linux-66fd9385ee9c582ee88031ba5028748cb38c986d.zip
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/wacom_w8001.c')
-rw-r--r--drivers/input/touchscreen/wacom_w8001.c8
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)
{
struct w8001 *w8001 = serio_get_drvdata(serio);
- input_get_device(w8001->dev);
- input_unregister_device(w8001->dev);
serio_close(serio);
- serio_set_drvdata(serio, NULL);
- input_put_device(w8001->dev);
+
+ input_unregister_device(w8001->dev);
kfree(w8001);
+
+ serio_set_drvdata(serio, NULL);
}
/*