Changeset 19f0048 in mainline for uspace/lib/usbhost/src/utility.c

Timestamp:

2018-02-01T02:13:34Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

17d34a8

Parents:

53fdf8c

Message:

xhci: reinitialize in case of HC error

File:

• uspace/lib/usbhost/src/utility.c (modified) (4 diffs)

uspace/lib/usbhost/src/utility.c

@@ -297 +297 @@
 {
         joinable_fibril_t *jf = arg;
+
         jf->worker(jf->arg);
 
@@ -315 +316 @@
                 return NULL;
 
-        jf->fid = fibril_create(joinable_fibril_worker, jf);
-        if (!jf->fid) {
-                free(jf);
-                return NULL;
-        }
-
         jf->worker = worker;
         jf->arg = arg;
@@ -326 +321 @@
         fibril_condvar_initialize(&jf->dead_cv);
 
+        if (joinable_fibril_recreate(jf)) {
+                free(jf);
+                return NULL;
+        }
+
         return jf;
 }
-
 
 /**
@@ -353 +352 @@
                 fibril_condvar_wait(&jf->dead_cv, &jf->guard);
         fibril_mutex_unlock(&jf->guard);
+
+        jf->fid = 0;
+}
+
+/**
+ * Reinitialize a joinable fibril.
+ */
+errno_t joinable_fibril_recreate(joinable_fibril_t *jf)
+{
+        assert(!jf->fid);
+
+        jf->fid = fibril_create(joinable_fibril_worker, jf);
+        return jf->fid ? EOK : ENOMEM;
 }