From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Wed, 1 Sep 2010 00:27:02 +0000 (-0700)
Subject: Input: i8042 - fix device removal on unload
X-Git-Tag: firefly_0821_release~10186^2~1001
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3327857e9b33f2cb9921e469f9ea1806fdedc9b;p=firefly-linux-kernel-4.4.55.git

Input: i8042 - fix device removal on unload

commit af045b86662f17bf130239a65995c61a34f00a6b upstream.

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>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 1df02d25aca5..16f5ab2ee034 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1412,8 +1412,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;