Changeset bcf54ac in mainline

Timestamp:

2011-11-07T12:03:13Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a0c05e7

Parents:

2155955

Message:

usbhid, keyboard: Do not destroy functions that fail to unbind.

File:

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

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

@@ -531 +531 @@
                     "Could not add DDF function to category %s: %s.\n",
                     HID_KBD_CLASS_NAME, str_error(rc));
-                ddf_fun_unbind(fun);
-                fun->driver_data = NULL; /* We need this later */
-                ddf_fun_destroy(fun);
+                if (ddf_fun_unbind(fun) == EOK) {
+                        fun->driver_data = NULL; /* We need this later */
+                        ddf_fun_destroy(fun);
+                } else {
+                        usb_log_error(
+                            "Failed to unbind `%s', will not destroy.\n",
+                            fun->name);
+                }
                 return rc;
         }