mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-04 06:06:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/wmr: Tidy camera destroy function

Browse source
This commit is contained in:
Jakob Bornecrantz 2023-04-04 14:26:14 +01:00
parent 1410afc330
commit 6ee235ac3b
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -511,7 +511,6 @@ wmr_camera_open(struct wmr_camera_open_config *config)
return cam; return cam;
fail: fail:
WMR_CAM_ERROR(cam, "Failed to open camera: %s", libusb_error_name(res)); WMR_CAM_ERROR(cam, "Failed to open camera: %s", libusb_error_name(res));
wmr_camera_free(cam); wmr_camera_free(cam);
@ -540,11 +539,16 @@ wmr_camera_free(struct wmr_camera *cam)
os_thread_helper_destroy(&cam->usb_thread); os_thread_helper_destroy(&cam->usb_thread);
for (i = 0; i < NUM_XFERS; i++) { for (i = 0; i < NUM_XFERS; i++) {
if (cam->xfers[i] != NULL) if (cam->xfers[i] == NULL) {
continue;
}
libusb_free_transfer(cam->xfers[i]); libusb_free_transfer(cam->xfers[i]);
cam->xfers[i] = NULL;
} }
libusb_exit(cam->ctx); libusb_exit(cam->ctx);
cam->ctx = NULL;
} }
// Tidy the variable tracking. // Tidy the variable tracking.
@ -552,8 +556,6 @@ wmr_camera_free(struct wmr_camera *cam)
u_sink_debug_destroy(&cam->debug_sinks[0]); u_sink_debug_destroy(&cam->debug_sinks[0]);
u_sink_debug_destroy(&cam->debug_sinks[1]); u_sink_debug_destroy(&cam->debug_sinks[1]);
free(cam); free(cam);
} }