[PATCH] USB: Fix hiddev devfs oops

From: Herbert Xu <herbert@gondor.apana.org.au>

There is a long-standing devfs_unregister oops in hid/hiddev.  It's caused
by hid calling hiddev_exit before unregistering itself which in turn calls
hiddev_disconnect.

hiddev_exit removes the directory which contains the hiddev devices.
Therefore it needs to be called after the hiddev devices have been
disconnected.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index fb8d25a94d9d132304b53298ab2ff8ea4dffef49..5c415425a18c2eabc07b9aecf5f55906197141e9 100644 (file)
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1859,8 +1859,8 @@ hiddev_init_fail:
 
 static void __exit hid_exit(void)
 {
-       hiddev_exit();
        usb_deregister(&hid_driver);
+       hiddev_exit();
 }
 
 module_init(hid_init);