Changeset 3690c75 in mainline for uspace/drv/usbhid/mouse

Timestamp:

2011-04-15T16:13:07Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

242f0e2, e3f1987

Parents:

6b082a1b (diff), 11d2e96a (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:

Development branch fixes

File:

• uspace/drv/usbhid/mouse/mousedev.c (modified) (1 diff)

uspace/drv/usbhid/mouse/mousedev.c

@@ -157 +157 @@
 static void usb_mouse_free(usb_mouse_t **mouse_dev)
 {
-        if (mouse_dev == NULL || *mouse_dev == NULL) {
-                return;
-        }
+        assert(mouse_dev != NULL && *mouse_dev != NULL);
         
         // hangup phone to the console
-        async_hangup((*mouse_dev)->console_phone);
+        if ((*mouse_dev)->console_phone >= 0) {
+                async_hangup((*mouse_dev)->console_phone);
+        }
         
         free(*mouse_dev);