Merge branch 'espressif:master' into feature/support_sccb_handle_16bit_val

WangYuxin-esp · web-flow · commit 02e629a96a15 · 2022-11-08T16:58:04.000+08:00
diff --git a/driver/cam_hal.c b/driver/cam_hal.c
@@ -435,6 +435,9 @@ esp_err_t cam_deinit(void)
     if (cam_obj->frame_buffer_queue) {
         vQueueDelete(cam_obj->frame_buffer_queue);
     }
+
+    ll_cam_deinit(cam_obj);
+    
     if (cam_obj->dma) {
         free(cam_obj->dma);
     }
@@ -451,8 +454,6 @@ esp_err_t cam_deinit(void)
         free(cam_obj->frames);
     }
 
-    ll_cam_deinit(cam_obj);
-
     free(cam_obj);
     cam_obj = NULL;
     return ESP_OK;

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,9 @@ esp_err_t cam_deinit(void)`
`435`	`435`	`if (cam_obj->frame_buffer_queue) {`
`436`	`436`	`vQueueDelete(cam_obj->frame_buffer_queue);`
`437`	`437`	`}`
	`438`	`+`
	`439`	`+ ll_cam_deinit(cam_obj);`
	`440`	`+`
`438`	`441`	`if (cam_obj->dma) {`
`439`	`442`	`free(cam_obj->dma);`
`440`	`443`	`}`
`@@ -451,8 +454,6 @@ esp_err_t cam_deinit(void)`
`451`	`454`	`free(cam_obj->frames);`
`452`	`455`	`}`
`453`	`456`
`454`		`- ll_cam_deinit(cam_obj);`
`455`		`-`
`456`	`457`	`free(cam_obj);`
`457`	`458`	`cam_obj = NULL;`
`458`	`459`	`return ESP_OK;`