summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-08-31 17:27:02 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-08-31 18:28:15 -0700
commitaf045b86662f17bf130239a65995c61a34f00a6b (patch)
treed4f9c03e7934ca04e17f6f0be91884c889052cf8 /drivers/input/serio/i8042.c
parent57157becdd1d23e6c2b8661ffe6c78d7d605d121 (diff)
downloadop-kernel-dev-af045b86662f17bf130239a65995c61a34f00a6b.zip
op-kernel-dev-af045b86662f17bf130239a65995c61a34f00a6b.tar.gz
Input: i8042 - fix device removal on unload
We need to call platform_device_unregister(i8042_platform_device) before calling platform_driver_unregister() because i8042_remove() resets i8042_platform_device to NULL. This leaves the platform device instance behind and prevents driver reload. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=16613 Reported-by: Seryodkin Victor <vvscore@gmail.com> Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/i8042.c')
-rw-r--r--drivers/input/serio/i8042.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 46e4ba0..f585131 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1485,8 +1485,8 @@ static int __init i8042_init(void)
static void __exit i8042_exit(void)
{
- platform_driver_unregister(&i8042_driver);
platform_device_unregister(i8042_platform_device);
+ platform_driver_unregister(&i8042_driver);
i8042_platform_exit();
panic_blink = NULL;
OpenPOWER on IntegriCloud