Changeset a91fbb1 in mainline for uspace/drv/usbhid/mouse/mousedev.c

Timestamp:

2011-04-15T20:53:17Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2c2cbcf

Parents:

27b85d9 (diff), 8595577b (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:

Merge development/ changes

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);