Changeset a81a1d09 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-05-11T16:49:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

File:

• uspace/drv/usbhub/usbhub.c (modified) (2 diffs)

uspace/drv/usbhub/usbhub.c

@@ -411 +411 @@
 static int usb_process_hub_power_change(usb_hub_info_t * hub_info,
     usb_hub_status_t status) {
-        int opResult;
+        int opResult = EOK;
         if (!usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) {
                 //restart power on hub
@@ -431 +431 @@
                         }
                 }
-                opResult = usb_hub_clear_feature(hub_info->control_pipe,
-                    USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+        }
+        if(opResult!=EOK){
+                return opResult;//no feature clearing
+        }
+        opResult = usb_hub_clear_feature(hub_info->control_pipe,
+            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
                 if (opResult != EOK) {
-                        usb_log_error("cannnot clear hub power change flag: "
-                            "%d\n",
-                            opResult);
-                }
+                usb_log_error("cannnot clear hub power change flag: "
+                    "%d\n",
+                    opResult);
         }
         return opResult;