Changeset 1114173 in mainline for uspace/drv/bus/usb/usbmast/main.c

Timestamp:

2011-10-06T09:49:39Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

e68c834

Parents:

9b9d37bb (diff), d6c953e9 (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 with mainline

File:

• uspace/drv/bus/usb/usbmast/main.c (modified) (2 diffs)

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

@@ -97 +97 @@
         if (mdev == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
-                rc = ENOMEM;
-                goto error;
+                return ENOMEM;
         }
 
@@ -125 +124 @@
 error:
         /* XXX Destroy functions */
-        if (mdev != NULL)
-                free(mdev);
         return rc;
 }