Changeset 54935cf6 in mainline

Timestamp:

2011-10-03T07:42:08Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

01ab41b

Parents:

00a8f1b (diff), 60c6fe0 (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

Location:

uspace

Files:

• drv/bus/usb/usbmast/main.c (modified) (3 diffs)
• lib/c/generic/ns.c (modified) (1 diff)

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

@@ -158 +158 @@
         }
 
-        free(fun_name);
-
         /* Allocate soft state */
         mfun = ddf_dev_data_alloc(mdev->ddf_dev, sizeof(usbmast_fun_t));
@@ -170 +168 @@
         mfun->mdev = mdev;
         mfun->lun = lun;
-
-        fun_name = NULL;
 
         /* Set up a connection handler. */
@@ -219 +215 @@
                 goto error;
         }
+
+        free(fun_name);
 
         return EOK;

uspace/lib/c/generic/ns.c

@@ -75 +75 @@
 {
         async_exch_t *exch = async_exchange_begin(session_ns);
+        if (!exch)
+                return NULL;
         async_sess_t *sess =
             async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3);
         async_exchange_end(exch);
+
+        if (!sess)
+                return NULL;
         
         /*