From 5c5c4c05f0250d4b8bf0696e6eff7c71a3638d39 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Tue, 23 Aug 2011 22:57:00 -0700 Subject: [PATCH] --- yaml --- r: 269448 b: refs/heads/master c: 66fd9385ee9c582ee88031ba5028748cb38c986d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/wacom_w8001.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 787a2cd3230d..0213c8c6ae98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9496746cc0954c43720de0c88fef95a9d229baa +refs/heads/master: 66fd9385ee9c582ee88031ba5028748cb38c986d diff --git a/trunk/drivers/input/touchscreen/wacom_w8001.c b/trunk/drivers/input/touchscreen/wacom_w8001.c index 5ece6c1f3296..1f42d91f755b 100644 --- a/trunk/drivers/input/touchscreen/wacom_w8001.c +++ b/trunk/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); } /*