Changeset 8e7c9fe in mainline for uspace/lib/drv/generic/remote_usbhc.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (2 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -212 +212 @@
 static void async_transaction_destroy(async_transaction_t *trans)
 {
-        if (trans == NULL) {
-                return;
-        }
-        if (trans->buffer != NULL) {
+        if (trans == NULL)
+                return;
+        
+        if (trans->buffer != NULL)
                 free(trans->buffer);
-        }
-
+        
         free(trans);
 }
@@ -304 +303 @@
                 async_answer_0(callid, ENOMEM);
                 async_transaction_destroy(trans);
+                return;
         }