Changeset f2964e45 in mainline

Timestamp:

2011-10-14T15:36:12Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

98604cc

Parents:

c5b6db53

Message:

usbhid: mouse drv unbinds DDF functions on destruction.

Location:

uspace/drv/bus/usb/usbhid/mouse

Files:

• mousedev.c (modified) (6 diffs)
• mousedev.h (modified) (1 diff)

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -186 +186 @@
         if (mouse_dev->wheel_sess != NULL)
                 async_hangup(mouse_dev->wheel_sess);
+        int ret = ddf_fun_unbind(mouse_dev->mouse_fun);
+        if (ret != EOK) {
+                usb_log_error("Failed to unbind mouse function.\n");
+        } else {
+                ddf_fun_destroy(mouse_dev->mouse_fun);
+                /* Prevent double free */
+                mouse_dev->wheel_fun->driver_data = NULL;
+        }
+
+        ret = ddf_fun_unbind(mouse_dev->wheel_fun);
+        if (ret != EOK) {
+                usb_log_error("Failed to unbind wheel function.\n");
+        } else {
+                ddf_fun_destroy(mouse_dev->wheel_fun);
+        }
 }
 
@@ -338 +353 @@
                 usb_log_error("Could not bind DDF function: %s.\n",
                     str_error(rc));
-                ddf_fun_destroy(fun);
                 return rc;
         }
@@ -349 +363 @@
                     "Could not add DDF function to category %s: %s.\n",
                     HID_MOUSE_CATEGORY, str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
-        }
+                return rc;
+        }
+        mouse->mouse_fun = fun;
 
         /*
@@ -376 +390 @@
                 usb_log_error("Could not bind DDF function: %s.\n",
                     str_error(rc));
-                ddf_fun_destroy(fun);
                 return rc;
         }
@@ -387 +400 @@
                     "Could not add DDF function to category %s: %s.\n",
                     HID_MOUSE_WHEEL_CATEGORY, str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
-        }
+                return rc;
+        }
+        mouse->wheel_fun = fun;
 
         return EOK;
@@ -511 +524 @@
 {
         if (data != NULL) {
-                usb_mouse_destroy((usb_mouse_t *)data);
+                usb_mouse_destroy(data);
         }
 }

uspace/drv/bus/usb/usbhid/mouse/mousedev.h

@@ -55 +55 @@
 
         ddf_dev_ops_t ops;
+        /* DDF mouse function */
+        ddf_fun_t *mouse_fun;
+        /* DDF mouse function */
+        ddf_fun_t *wheel_fun;
 } usb_mouse_t;