Changeset 925a21e in mainline for uspace/drv/bus/usb/uhci/main.c

Timestamp:

2011-09-24T14:20:29Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/bus/usb/uhci/main.c (modified) (1 diff)

uspace/drv/bus/usb/uhci/main.c

@@ -64 +64 @@
         assert(device);
 
-        int ret = device_setup_uhci(device);
+        const int ret = device_setup_uhci(device);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize UHCI driver: %s.\n",
                     str_error(ret));
-                return ret;
+        } else {
+                usb_log_info("Controlling new UHCI device '%s'.\n",
+                    device->name);
         }
-        usb_log_info("Controlling new UHCI device '%s'.\n", device->name);
 
-        return EOK;
+        return ret;
 }
 /*----------------------------------------------------------------------------*/