Changeset 7b54b99 in mainline for uspace/drv/bus/usb/usbhid/kbd/kbddev.c

Timestamp:

2011-10-14T14:46:59Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

571ba2a

Parents:

cddd151

Message:

usbhid: kbd unbind and destroy ddf function during destruction.

Remove redundant argument form usb_kbd_create_function().

File:

• uspace/drv/bus/usb/usbhid/kbd/kbddev.c (modified) (4 diffs)

uspace/drv/bus/usb/usbhid/kbd/kbddev.c

@@ -514 +514 @@
 /*----------------------------------------------------------------------------*/
 
-static int usb_kbd_create_function(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev)
-{
-        assert(hid_dev != NULL);
-        assert(hid_dev->usb_dev != NULL);
+static int usb_kbd_create_function(usb_kbd_t *kbd_dev)
+{
         assert(kbd_dev != NULL);
+        assert(kbd_dev->hid_dev != NULL);
+        assert(kbd_dev->hid_dev->usb_dev != NULL);
 
         /* Create the exposed function. */
         usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME);
-        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
-            HID_KBD_FUN_NAME);
+        ddf_fun_t *fun = ddf_fun_create(kbd_dev->hid_dev->usb_dev->ddf_dev,
+            fun_exposed, HID_KBD_FUN_NAME);
         if (fun == NULL) {
                 usb_log_error("Could not create DDF function node.\n");
@@ -721 +721 @@
 
         usb_log_debug("Creating KBD function...\n");
-        int rc = usb_kbd_create_function(hid_dev, kbd_dev);
+        int rc = usb_kbd_create_function(kbd_dev);
         if (rc != EOK) {
                 usb_kbd_destroy(kbd_dev);
@@ -786 +786 @@
         free(kbd_dev->keys_old);
         free(kbd_dev->led_data);
+
         if (kbd_dev->led_path != NULL) {
                 usb_hid_report_path_free(kbd_dev->led_path);
@@ -791 +792 @@
         if (kbd_dev->output_buffer != NULL) {
                 usb_hid_report_output_free(kbd_dev->output_buffer);
+        }
+
+        if (ddf_fun_unbind(kbd_dev->fun) != EOK) {
+                usb_log_warning("Failed to unbind kbd function.\n");
+        } else {
+                kbd_dev->fun->driver_data = NULL;
+                ddf_fun_destroy(kbd_dev->fun);
         }
 }