Changes in uspace/drv/bus/usb/usbhid/mouse/mousedev.c [5f6e25e:1dc4a5e] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbhid/mouse/mousedev.c
r5f6e25e r1dc4a5e 183 183 /*----------------------------------------------------------------------------*/ 184 184 185 static void usb_mouse_ destroy(usb_mouse_t*mouse_dev)186 { 187 assert(mouse_dev != NULL );185 static void usb_mouse_free(usb_mouse_t **mouse_dev) 186 { 187 assert(mouse_dev != NULL && *mouse_dev != NULL); 188 188 189 189 // hangup phone to the console 190 if (mouse_dev->mouse_phone >= 0) { 191 async_obsolete_hangup(mouse_dev->mouse_phone); 192 } 193 194 if (mouse_dev->wheel_phone >= 0) { 195 async_obsolete_hangup(mouse_dev->wheel_phone); 196 } 190 if ((*mouse_dev)->mouse_phone >= 0) { 191 async_obsolete_hangup((*mouse_dev)->mouse_phone); 192 } 193 194 if ((*mouse_dev)->wheel_phone >= 0) { 195 async_obsolete_hangup((*mouse_dev)->wheel_phone); 196 } 197 198 free(*mouse_dev); 199 *mouse_dev = NULL; 197 200 } 198 201 … … 434 437 int rc = usb_mouse_create_function(hid_dev, mouse_dev); 435 438 if (rc != EOK) { 436 usb_mouse_ destroy(mouse_dev);439 usb_mouse_free(&mouse_dev); 437 440 return rc; 438 441 } … … 461 464 { 462 465 if (data != NULL) { 463 usb_mouse_ destroy((usb_mouse_t *)data);466 usb_mouse_free((usb_mouse_t **)&data); 464 467 } 465 468 }
Note:
See TracChangeset
for help on using the changeset viewer.