[PATCH] USB: usb/core/hcd.c::usb_init() missing audit.

Signed-off-by: Luiz Capitulino <lcapitulino@prefeitura.sp.gov.br>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 7d439922baa848a8722d18c420c9daf9714e2e38..8692bb1ea850d745ef63b53e629e891ed0e99de5 100644 (file)
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -626,9 +626,9 @@ static struct class usb_host_class = {
        .release        = &usb_host_release,
 };
 
-void usb_host_init(void)
+int usb_host_init(void)
 {
-       class_register(&usb_host_class);
+       return class_register(&usb_host_class);
 }
 
 void usb_host_cleanup(void)

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index e2fc7d5c1c3a23d70569cf77334f34e890a14dd8..66137a2fda5a0b7e0bd0be17d72265d45327d3ed 100644 (file)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1300,7 +1300,9 @@ static int __init usb_init(void)
        retval = bus_register(&usb_bus_type);
        if (retval) 
                goto out;
-       usb_host_init();
+       retval = usb_host_init();
+       if (retval)
+               goto host_init_failed;
        retval = usb_major_init();
        if (retval)
                goto major_init_failed;
@@ -1322,6 +1324,7 @@ fs_init_failed:
        usb_major_cleanup();    
 major_init_failed:
        usb_host_cleanup();
+host_init_failed:
        bus_unregister(&usb_bus_type);
 out:
        return retval;