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

Timestamp:

2011-10-17T07:29:44Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

12f55220

Parents:

25696fea (diff), 1f131fb9 (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

File:

• uspace/drv/bus/usb/usbhid/main.c (modified) (3 diffs)

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

@@ -92 +92 @@
         if (rc != EOK) {
                 usb_log_error("Failed to initialize USB/HID device.\n");
-                usb_hid_destroy(hid_dev);
+                usb_hid_deinit(hid_dev);
                 return rc;
         }
@@ -128 +128 @@
                 usb_log_error("Failed to start polling fibril for `%s'.\n",
                     dev->ddf_dev->name);
-                usb_hid_destroy(hid_dev);
+                usb_hid_deinit(hid_dev);
                 return rc;
         }
         hid_dev->running = true;
-        dev->driver_data = hid_dev;
 
         /*
@@ -204 +203 @@
 
         assert(!hid_dev->running);
-        usb_hid_destroy(hid_dev);
+        usb_hid_deinit(hid_dev);
         usb_log_debug2("%s destruction complete.\n", dev->ddf_dev->name);
         return EOK;