Changeset 458e40c in mainline for uspace/lib/usb/src/recognise.c

Timestamp:

2011-02-04T14:26:40Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

400575c5, 89acf204

Parents:

bfc12ef (diff), 6f8f808 (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:

Merged minor fixes and improvements

See log messages of merged revisions.

File:

• uspace/lib/usb/src/recognise.c (modified) (3 diffs)

uspace/lib/usb/src/recognise.c

@@ -359 +359 @@
 {
         static size_t device_name_index = 0;
+        static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex);
+
+        size_t this_device_name_index;
+
+        fibril_mutex_lock(&device_name_index_mutex);
+        this_device_name_index = device_name_index;
+        device_name_index++;
+        fibril_mutex_unlock(&device_name_index_mutex);
+
 
         device_t *child = NULL;
@@ -374 +383 @@
          * naming etc., something more descriptive could be created.
          */
-        rc = asprintf(&child_name, "usbdev%02zu", device_name_index);
+        rc = asprintf(&child_name, "usbdev%02zu", this_device_name_index);
         if (rc < 0) {
                 goto failure;
@@ -396 +405 @@
         }
         
-        device_name_index++;
-
         return EOK;