summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-09-12 22:13:00 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-09-20 22:46:31 -0700
commitc3a01ba9e45f01c6505a41efb33c420a0c959eb3 (patch)
tree24e2e17f328b0be9afb799d26328792b38ba3208 /drivers/input
parent98b013eb7a94cfd29fcc782f3b7d9f9fe06ac50d (diff)
downloadop-kernel-dev-c3a01ba9e45f01c6505a41efb33c420a0c959eb3.zip
op-kernel-dev-c3a01ba9e45f01c6505a41efb33c420a0c959eb3.tar.gz
Input: penmount - simplify unregister procedure
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: John Sung <penmount.touch@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/penmount.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c
index 7fc5562..4c012fb 100644
--- a/drivers/input/touchscreen/penmount.c
+++ b/drivers/input/touchscreen/penmount.c
@@ -183,12 +183,12 @@ static void pm_disconnect(struct serio *serio)
{
struct pm *pm = serio_get_drvdata(serio);
- input_get_device(pm->dev);
- input_unregister_device(pm->dev);
serio_close(serio);
- serio_set_drvdata(serio, NULL);
- input_put_device(pm->dev);
+
+ input_unregister_device(pm->dev);
kfree(pm);
+
+ serio_set_drvdata(serio, NULL);
}
/*
OpenPOWER on IntegriCloud