Changeset b0b4592e in mainline for uspace/srv/audio/hound/iface.c

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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/srv/audio/hound/iface.c (modified) (2 diffs)

uspace/srv/audio/hound/iface.c

@@ -38 +38 @@
 #include <hound/protocol.h>
 #include <inttypes.h>
-#include <malloc.h>
 
 #include "hound.h"
@@ -70 +69 @@
         if (!ctx)
                 return EINVAL;
-        int ret = hound_remove_ctx(server, ctx);
-        if (ret != EOK)
-                return ret;
-        hound_ctx_destroy(ctx);
-        log_info("%s: %p, %#" PRIxn, __FUNCTION__, server, id);
-        return EOK;
+        const int ret = hound_remove_ctx(server, ctx);
+        if (ret == EOK) {
+                hound_ctx_destroy(ctx);
+                log_info("%s: %p, %#" PRIxn, __FUNCTION__, server, id);
+        }
+        return ret;
 }