From: Dmitry Torokhov Date: Wed, 1 Sep 2010 00:27:02 +0000 (-0700) Subject: Input: i8042 - fix device removal on unload X-Git-Tag: v2.6.36-rc4~69^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=af045b86662f17bf130239a65995c61a34f00a6b;p=~emulex%2Finfiniband.git 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 Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 46e4ba0b924..f5851316048 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;