[PATCH] USB: PATCH 2/19 Audit usb_register/usb_serial_register under divers/usb/serial

856a84f8 · Daniele Bellucci · Greg Kroah-Hartman · 82dd4505 · 856a84f8
Commit 856a84f8 authored Aug 22, 2003 by Daniele Bellucci Committed by Greg Kroah-Hartman Aug 22, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

drivers/usb/serial/cyberjack.c drivers/usb/serial/cyberjack.c +11 -2

No files found.
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -464,13 +464,22 @@ static void cyberjack_write_bulk_callback (struct urb *urb, struct pt_regs *regs
 static int __init cyberjack_init (void)
 {
-	usb_serial_register (&cyberjack_device);
+	int retval;
-	usb_register (&cyberjack_driver);
+	retval  = usb_serial_register(&cyberjack_device);
+	if (retval)
+		goto failed_usb_serial_register;
+	retval = usb_register(&cyberjack_driver);
+	if (retval) 
+		goto failed_usb_register;
 	info(DRIVER_VERSION " " DRIVER_AUTHOR);
 	info(DRIVER_DESC);
 	return 0;
+failed_usb_register:
+	usb_serial_deregister(&cyberjack_device);
+failed_usb_serial_register:
+	return retval;
 }
 static void __exit cyberjack_exit (void)