staging: bcm: fix error handling in bcm_init()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Sun, 2 Sep 2012 19:30:13 +0000 (23:30 +0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Sep 2012 21:28:42 +0000 (14:28 -0700)
bcm_init() does not have proper error handling of usb_register().
The patch implements one.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/bcm/InterfaceInit.c

index 8f85de6a57ba1d3800e4cd1bf8d05360922bec0e..57452efa6abb17159412b6d87972da341daec0f5 100644 (file)
@@ -669,6 +669,8 @@ struct class *bcm_class;
 
 static __init int bcm_init(void)
 {
+       int retval;
+
        printk(KERN_INFO "%s: %s, %s\n", DRV_NAME, DRV_DESCRIPTION, DRV_VERSION);
        printk(KERN_INFO "%s\n", DRV_COPYRIGHT);
 
@@ -678,7 +680,13 @@ static __init int bcm_init(void)
                return PTR_ERR(bcm_class);
        }
 
-       return usb_register(&usbbcm_driver);
+       retval = usb_register(&usbbcm_driver);
+       if (retval < 0) {
+               printk(KERN_ERR DRV_NAME ": could not register usb driver\n");
+               class_destroy(bcm_class);
+               return retval;
+       }
+       return 0;
 }
 
 static __exit void bcm_exit(void)