Changeset a0c05e7 in mainline

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

45e7868

Parents:

bcf54ac

Message:

usbhid: Unbind error handling.

Location:

uspace/drv/bus/usb/usbhid

Files:

• generic/hiddev.c (modified) (1 diff)
• multimedia/multimedia.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhid/generic/hiddev.c

@@ -179 +179 @@
                 return;
 
-        const int ret = ddf_fun_unbind(fun);
-        if (ret != EOK) {
+        if (ddf_fun_unbind(fun) != EOK) {
                 usb_log_error("Failed to unbind generic hid fun.\n");
                 return;

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

@@ -201 +201 @@
                     "Could not add DDF function to category 'keyboard': %s.\n",
                     str_error(rc));
-                ddf_fun_destroy(fun);
+                if (ddf_fun_unbind(fun) != EOK) {
+                        usb_log_error("Failed to unbind %s, won't destroy.\n",
+                            fun->name);
+                } else {
+                        ddf_fun_destroy(fun);
+                }
                 return rc;
         }
@@ -220 +225 @@
                 if (multim_dev->console_sess)
                         async_hangup(multim_dev->console_sess);
-                const int ret = ddf_fun_unbind(fun);
-                if (ret != EOK) {
-                        usb_log_error("Failed to unbind %s function.\n",
+                if (ddf_fun_unbind(fun) != EOK) {
+                        usb_log_error("Failed to unbind %s, won't destroy.\n",
                             fun->name);
                 } else {