Changeset 520acaf in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2012-06-06T21:13:29Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

5f679702

Parents:

11b9ad7 (diff), 3123d2a (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/lib/usbdev/src/hub.c (modified) (3 diffs)

uspace/lib/usbdev/src/hub.c

@@ -33 +33 @@
  * Functions needed by hub drivers.
  */
+
 #include <usb/dev/hub.h>
 #include <usb/dev/pipes.h>
@@ -114 +115 @@
         return EOK;
 }
-
 
 /** Wrapper for registering attached device to the hub.
@@ -160 +160 @@
     ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
 {
-        if (new_fun == NULL || hc_conn == NULL)
+        if ((new_fun == NULL) || (hc_conn == NULL))
                 return EINVAL;