mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wmr: Clean up camera debug last.

Browse source 
Make sure to stop the USB thread before destroying the debug sink
as cancelling the transfers is not sufficient to guarantee
there will be no final callback (or one in progress)
This commit is contained in:
Jan Schmidt 2022-06-19 20:36:08 +10:00 committed by Ryan Pavlik
parent 11525976fa
commit 96fb9ce34a
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/xrt/drivers/wmr/wmr_camera.c
View file

@ -489,12 +489,6 @@ wmr_camera_free(struct wmr_camera *cam)
// Stop the camera.
wmr_camera_stop(cam);
// Tidy the variable tracking.
u_var_remove_root(cam);
u_sink_debug_destroy(&cam->debug_sinks[0]);
u_sink_debug_destroy(&cam->debug_sinks[1]);
if (cam->ctx != NULL) {
int i;
@ -516,6 +510,13 @@ wmr_camera_free(struct wmr_camera *cam)
libusb_exit(cam->ctx);
}
// Tidy the variable tracking.
u_var_remove_root(cam);
u_sink_debug_destroy(&cam->debug_sinks[0]);
u_sink_debug_destroy(&cam->debug_sinks[1]);
free(cam);
}