Changeset f750345 in mainline for uspace/drv/bus/usb/usbhid/main.c

Timestamp:

2011-11-07T11:05:42Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2155955

Parents:

0f12c17

Message:

usbhid: Refactor wait loop.

File:

• uspace/drv/bus/usb/usbhid/main.c (modified) (1 diff)

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

@@ -193 +193 @@
 static int usb_hid_device_gone(usb_device_t *dev)
 {
+        assert(dev);
+        assert(dev->driver_data);
         usb_hid_dev_t *hid_dev = dev->driver_data;
-        unsigned tries = 10;
-        while (hid_dev->running) {
+        unsigned tries = 100;
+        /* Wait for fail. */
+        while (hid_dev->running && tries--) {
                 async_usleep(100000);
-                if (!tries--) {
-                        usb_log_error("Can't remove hid, still running.\n");
-                        return EBUSY;
-                }
-        }
-
-        assert(!hid_dev->running);
+        }
+        if (hid_dev->running) {
+                usb_log_error("Can't remove hid, still running.\n");
+                return EBUSY;
+        }
+
         usb_hid_deinit(hid_dev);
         usb_log_debug2("%s destruction complete.\n", dev->ddf_dev->name);