binding a device driver could fail.. handle this case

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14493 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 9 insertions, 3 deletions

diff --git a/firmware/usbstack/core/core.c b/firmware/usbstack/core/core.c
index e201b7547f..2fbec5d571 100644
--- a/firmware/usbstack/core/core.c
+++ b/firmware/usbstack/core/core.c
@@ -378,6 +378,8 @@ static void update_driver_names(unsigned char* result) {
 
 static void bind_device_driver(struct usb_device_driver* driver) {
 
+    int ret = 0;
+
     /* look if there is an old driver */
     if (usbcore.active_controller->device_driver != NULL) {
         usbcore.active_controller->device_driver->unbind();
@@ -387,7 +389,11 @@ static void bind_device_driver(struct usb_device_driver* driver) {
     usbcore.active_controller->device_driver = driver;
 
     /* init dirver */
-    driver->bind(usbcore.active_controller->controller_ops);
-}
-
+    ret = driver->bind(usbcore.active_controller->controller_ops);
 
+    if (ret != 0) {
+        logf("binding of %s failed", driver->name);
+        usbcore.active_controller->device_driver = NULL;
+        usbcore.device_driver = NULL;
+    }
+}