From ddd070fc3374c123146ccf34e45db045a41543b8 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 31 Aug 2010 17:27:02 -0700
Subject: [PATCH] --- yaml --- r: 210379 b: refs/heads/master c:
 af045b86662f17bf130239a65995c61a34f00a6b h: refs/heads/master i:   210377:
 b36e7d1d1fdb409e6b02c069a39c0e7077edda67   210375:
 2917e0e5be41d732ab12be4871c66b5f38196fbb v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/input/serio/i8042.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cf4e1056ee26..b8e909483d4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57157becdd1d23e6c2b8661ffe6c78d7d605d121
+refs/heads/master: af045b86662f17bf130239a65995c61a34f00a6b
diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c
index 46e4ba0b9246..f58513160480 100644
--- a/trunk/drivers/input/serio/i8042.c
+++ b/trunk/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;