Merge with 2.3.48.

1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/usb/printer.c b/drivers/usb/printer.c
index 07220ad9b..182915a19 100644
--- a/drivers/usb/printer.c
+++ b/drivers/usb/printer.c
@@ -432,18 +432,17 @@ static struct usb_driver usblp_driver = {
 	minor:		USBLP_MINOR_BASE
 };
 
-static void __exit usb_printer_cleanup(void)
-{
-	usb_deregister(&usblp_driver);
-}
-
-static int __init usb_printer_init(void)
+static int __init usblp_init(void)
 {
 	if (usb_register(&usblp_driver))
 		return -1;
-
 	return 0;
 }
 
-module_init(usb_printer_init);
-module_exit(usb_printer_cleanup);
+static void __exit usblp_exit(void)
+{
+	usb_deregister(&usblp_driver);
+}
+
+module_init(usblp_init);
+module_exit(usblp_exit);