Merge branch 'fix/check_the_return_value_of_underlying_deletion_function' into 'master'

leeebo · leeebo · commit 5f3e921d52c8 · 2025-11-04T09:58:33.000+08:00
fix(display): check the return value of the underlying deletion function

See merge request ae_group/esp-iot-solution!1389
diff --git a/components/display/lcd/esp_lcd_co5300/CHANGELOG.md b/components/display/lcd/esp_lcd_co5300/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.0.2 - 2025-09-29
+
+### bugfix:
+
+* Check the return value of the underlying deletion function. If it fails, propagate the error
+
 ## v1.0.1 - 2025-09-15
 
 ### Changes:
diff --git a/components/display/lcd/esp_lcd_co5300/esp_lcd_co5300_mipi.c b/components/display/lcd/esp_lcd_co5300/esp_lcd_co5300_mipi.c
@@ -154,11 +154,11 @@ static esp_err_t panel_co5300_del(esp_lcd_panel_t *panel)
 {
     co5300_panel_t *co5300 = (co5300_panel_t *)panel->user_data;
 
+    // Delete MIPI DPI panel
+    ESP_RETURN_ON_ERROR(co5300->del(panel), TAG, "del co5300 panel failed");
     if (co5300->reset_gpio_num >= 0) {
         gpio_reset_pin(co5300->reset_gpio_num);
     }
-    // Delete MIPI DPI panel
-    co5300->del(panel);
     ESP_LOGD(TAG, "del co5300 panel @%p", co5300);
     free(co5300);
 
diff --git a/components/display/lcd/esp_lcd_co5300/idf_component.yml b/components/display/lcd/esp_lcd_co5300/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.1"
+version: "1.0.2"
 description: ESP LCD CO5300(SPI & QSPI & MIPI-DSI)
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/display/lcd/esp_lcd_co5300
 repository: https://github.com/espressif/esp-iot-solution.git
diff --git a/components/display/lcd/esp_lcd_ek79007/CHANGELOG.md b/components/display/lcd/esp_lcd_ek79007/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.0.4 - 2025-09-29
+
+### bugfix:
+
+* Check the return value of the underlying deletion function. If it fails, propagate the error
+
 ## v1.0.3 - 2025-09-15
 
 ### Changes:
diff --git a/components/display/lcd/esp_lcd_ek79007/esp_lcd_ek79007.c b/components/display/lcd/esp_lcd_ek79007/esp_lcd_ek79007.c
@@ -191,11 +191,11 @@ static esp_err_t panel_ek79007_del(esp_lcd_panel_t *panel)
 {
     ek79007_panel_t *ek79007 = (ek79007_panel_t *)panel->user_data;
 
+    // Delete MIPI DPI panel
+    ESP_RETURN_ON_ERROR(ek79007->del(panel), TAG, "del ek79007 panel failed");
     if (ek79007->reset_gpio_num >= 0) {
         gpio_reset_pin(ek79007->reset_gpio_num);
     }
-    // Delete MIPI DPI panel
-    ek79007->del(panel);
     ESP_LOGD(TAG, "del ek79007 panel @%p", ek79007);
     free(ek79007);
 
diff --git a/components/display/lcd/esp_lcd_ek79007/idf_component.yml b/components/display/lcd/esp_lcd_ek79007/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.3"
+version: "1.0.4"
 targets:
   - esp32p4
 description: ESP LCD EK79007(MIPI-DSI)
diff --git a/components/display/lcd/esp_lcd_hx8399/CHANGELOG.md b/components/display/lcd/esp_lcd_hx8399/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.0.5 - 2025-09-29
+
+### bugfix:
+
+* Check the return value of the underlying deletion function. If it fails, propagate the error
+
 ## v1.0.4 - 2025-09-15
 
 ### Changes:
diff --git a/components/display/lcd/esp_lcd_hx8399/esp_lcd_hx8399.c b/components/display/lcd/esp_lcd_hx8399/esp_lcd_hx8399.c
@@ -168,11 +168,11 @@ static esp_err_t panel_hx8399_del(esp_lcd_panel_t *panel)
 {
     hx8399_panel_t *hx8399 = (hx8399_panel_t *)panel->user_data;
 
+    // Delete MIPI DPI panel
+    ESP_RETURN_ON_ERROR(hx8399->del(panel), TAG, "del hx8399 panel failed");
     if (hx8399->reset_gpio_num >= 0) {
         gpio_reset_pin(hx8399->reset_gpio_num);
     }
-    // Delete MIPI DPI panel
-    hx8399->del(panel);
     ESP_LOGD(TAG, "del hx8399 panel @%p", hx8399);
     free(hx8399);
 
diff --git a/components/display/lcd/esp_lcd_hx8399/idf_component.yml b/components/display/lcd/esp_lcd_hx8399/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.4"
+version: "1.0.5"
 targets:
   - esp32p4
 description: ESP LCD HX8399 (MIPI-DSI)
diff --git a/components/display/lcd/esp_lcd_jd9165/CHANGELOG.md b/components/display/lcd/esp_lcd_jd9165/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.0.4 - 2025-09-29
+
+### bugfix:
+
+* Check the return value of the underlying deletion function. If it fails, propagate the error
+
 ## v1.0.3 - 2025-09-15
 
 ### Changes:
diff --git a/components/display/lcd/esp_lcd_jd9165/esp_lcd_jd9165.c b/components/display/lcd/esp_lcd_jd9165/esp_lcd_jd9165.c
@@ -128,11 +128,11 @@ static esp_err_t panel_jd9165_del(esp_lcd_panel_t *panel)
 {
     jd9165_panel_t *jd9165 = (jd9165_panel_t *)panel->user_data;
 
+    // Delete MIPI DPI panel
+    ESP_RETURN_ON_ERROR(jd9165->del(panel), TAG, "del jd9165 panel failed");
     if (jd9165->reset_gpio_num >= 0) {
         gpio_reset_pin(jd9165->reset_gpio_num);
     }
-    // Delete MIPI DPI panel
-    jd9165->del(panel);
     ESP_LOGD(TAG, "del jd9165 panel @%p", jd9165);
     free(jd9165);
 
diff --git a/components/display/lcd/esp_lcd_jd9165/idf_component.yml b/components/display/lcd/esp_lcd_jd9165/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.3"
+version: "1.0.4"
 targets:
   - esp32p4
 description: ESP LCD JD9165 (MIPI-DSI)
diff --git a/components/display/lcd/esp_lcd_jd9365/CHANGELOG.md b/components/display/lcd/esp_lcd_jd9365/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.0.4 - 2025-09-29
+
+### bugfix:
+
+* Check the return value of the underlying deletion function. If it fails, propagate the error
+
 ## v1.0.3 - 2025-09-15
 
 ### Changes:
diff --git a/components/display/lcd/esp_lcd_jd9365/esp_lcd_jd9365.c b/components/display/lcd/esp_lcd_jd9365/esp_lcd_jd9365.c
@@ -338,11 +338,11 @@ static esp_err_t panel_jd9365_del(esp_lcd_panel_t *panel)
 {
     jd9365_panel_t *jd9365 = (jd9365_panel_t *)panel->user_data;
 
+    // Delete MIPI DPI panel
+    ESP_RETURN_ON_ERROR(jd9365->del(panel), TAG, "del jd9365 panel failed");
     if (jd9365->reset_gpio_num >= 0) {
         gpio_reset_pin(jd9365->reset_gpio_num);
     }
-    // Delete MIPI DPI panel
-    jd9365->del(panel);
     ESP_LOGD(TAG, "del jd9365 panel @%p", jd9365);
     free(jd9365);
 
diff --git a/components/display/lcd/esp_lcd_jd9365/idf_component.yml b/components/display/lcd/esp_lcd_jd9365/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.3"
+version: "1.0.4"
 targets:
   - esp32p4
 description: ESP LCD JD9365(MIPI-DSI)
diff --git a/components/display/lcd/esp_lcd_nv3052/CHANGELOG.md b/components/display/lcd/esp_lcd_nv3052/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.0.1 - 2025-09-29
+
+### bugfix:
+
+* Check the return value of the underlying deletion function. If it fails, propagate the error
+
 ## v1.0.0 - 2025-7-17
 
 ### Enhancements:
diff --git a/components/display/lcd/esp_lcd_nv3052/esp_lcd_nv3052.c b/components/display/lcd/esp_lcd_nv3052/esp_lcd_nv3052.c
@@ -439,11 +439,11 @@ static esp_err_t panel_nv3052_del(esp_lcd_panel_t *panel)
 {
     nv3052_panel_t *nv3052 = (nv3052_panel_t *)panel->user_data;
 
+    // Delete RGB panel
+    ESP_RETURN_ON_ERROR(nv3052->del(panel), TAG, "del nv3052 panel failed");
     if (nv3052->reset_gpio_num >= 0) {
         gpio_reset_pin(nv3052->reset_gpio_num);
     }
-    // Delete RGB panel
-    nv3052->del(panel);
     free(nv3052);
     ESP_LOGD(TAG, "del nv3052 panel @%p", nv3052);
     return ESP_OK;
diff --git a/components/display/lcd/esp_lcd_nv3052/idf_component.yml b/components/display/lcd/esp_lcd_nv3052/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.0"
+version: "1.0.1"
 targets:
   - esp32s3
   - esp32p4
diff --git a/components/display/lcd/esp_lcd_st7701/CHANGELOG.md b/components/display/lcd/esp_lcd_st7701/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.1.5 - 2025-09-29
+
+### bugfix:
+
+* Check the return value of the underlying deletion function. If it fails, propagate the error
+
 ## v1.1.4 - 2025-09-15
 
 ### Changes:
diff --git a/components/display/lcd/esp_lcd_st7701/esp_lcd_st7701_mipi.c b/components/display/lcd/esp_lcd_st7701/esp_lcd_st7701_mipi.c
@@ -133,12 +133,11 @@ static esp_err_t panel_st7701_del(esp_lcd_panel_t *panel)
 {
     st7701_panel_t *st7701 = (st7701_panel_t *)panel->user_data;
 
+    // Delete MIPI DPI panel
+    ESP_RETURN_ON_ERROR(st7701->del(panel), TAG, "del st7701 panel failed");
     if (st7701->reset_gpio_num >= 0) {
         gpio_reset_pin(st7701->reset_gpio_num);
     }
-
-    // Delete MIPI DPI panel
-    st7701->del(panel);
     ESP_LOGD(TAG, "del st7701 panel @%p", st7701);
     free(st7701);
 
diff --git a/components/display/lcd/esp_lcd_st7701/esp_lcd_st7701_rgb.c b/components/display/lcd/esp_lcd_st7701/esp_lcd_st7701_rgb.c
@@ -288,11 +288,11 @@ static esp_err_t panel_st7701_del(esp_lcd_panel_t *panel)
 {
     st7701_panel_t *st7701 = (st7701_panel_t *)panel->user_data;
 
+    // Delete RGB panel
+    ESP_RETURN_ON_ERROR(st7701->del(panel), TAG, "del st7701 panel failed");
     if (st7701->reset_gpio_num >= 0) {
         gpio_reset_pin(st7701->reset_gpio_num);
     }
-    // Delete RGB panel
-    st7701->del(panel);
     free(st7701);
     ESP_LOGD(TAG, "del st7701 panel @%p", st7701);
     return ESP_OK;
diff --git a/components/display/lcd/esp_lcd_st7701/idf_component.yml b/components/display/lcd/esp_lcd_st7701/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.1.4"
+version: "1.1.5"
 targets:
   - esp32s3
   - esp32p4
diff --git a/components/display/lcd/esp_lcd_st7703/CHANGELOG.md b/components/display/lcd/esp_lcd_st7703/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.0.5 - 2025-09-29
+
+### bugfix:
+
+* Check the return value of the underlying deletion function. If it fails, propagate the error
+
 ## v1.0.4 - 2025-09-15
 
 ### Changes:
diff --git a/components/display/lcd/esp_lcd_st7703/esp_lcd_st7703.c b/components/display/lcd/esp_lcd_st7703/esp_lcd_st7703.c
@@ -164,11 +164,11 @@ static esp_err_t panel_st7703_del(esp_lcd_panel_t *panel)
 {
     st7703_panel_t *st7703 = (st7703_panel_t *)panel->user_data;
 
+    // Delete MIPI DPI panel
+    ESP_RETURN_ON_ERROR(st7703->del(panel), TAG, "del st7703 panel failed");
     if (st7703->reset_gpio_num >= 0) {
         gpio_reset_pin(st7703->reset_gpio_num);
     }
-    // Delete MIPI DPI panel
-    st7703->del(panel);
     ESP_LOGD(TAG, "del st7703 panel @%p", st7703);
     free(st7703);
 
diff --git a/components/display/lcd/esp_lcd_st7703/idf_component.yml b/components/display/lcd/esp_lcd_st7703/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.4"
+version: "1.0.5"
 targets:
   - esp32p4
 description: ESP LCD ST7703(MIPI-DSI)
diff --git a/components/display/lcd/esp_lcd_st77903_rgb/CHANGELOG.md b/components/display/lcd/esp_lcd_st77903_rgb/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.0.1 - 2025-09-29
+
+### bugfix:
+
+* Check the return value of the underlying deletion function. If it fails, propagate the error
+
 ## v1.0.0 - 2024-08-12
 
 ### Enhancements:
diff --git a/components/display/lcd/esp_lcd_st77903_rgb/esp_lcd_st77903_rgb.c b/components/display/lcd/esp_lcd_st77903_rgb/esp_lcd_st77903_rgb.c
@@ -320,11 +320,11 @@ static esp_err_t panel_st77903_rgb_del(esp_lcd_panel_t *panel)
 {
     st77903_panel_t *st77903 = (st77903_panel_t *)panel->user_data;
 
+    // Delete RGB panel
+    ESP_RETURN_ON_ERROR(st77903->del(panel), TAG, "del st77903 panel failed");
     if (st77903->reset_gpio_num >= 0) {
         gpio_reset_pin(st77903->reset_gpio_num);
     }
-    // Delete RGB panel
-    st77903->del(panel);
     free(st77903);
     ESP_LOGD(TAG, "del st77903 panel @%p", st77903);
     return ESP_OK;
diff --git a/components/display/lcd/esp_lcd_st77903_rgb/idf_component.yml b/components/display/lcd/esp_lcd_st77903_rgb/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.0"
+version: "1.0.1"
 targets:
   - esp32s3
   - esp32p4
diff --git a/components/display/lcd/esp_lcd_st77922/CHANGELOG.md b/components/display/lcd/esp_lcd_st77922/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.0.5 - 2025-09-29
+
+### bugfix:
+
+* Check the return value of the underlying deletion function. If it fails, propagate the error
+
 ## v1.0.4 - 2025-09-15
 
 ### Changes:
diff --git a/components/display/lcd/esp_lcd_st77922/esp_lcd_st77922_mipi.c b/components/display/lcd/esp_lcd_st77922/esp_lcd_st77922_mipi.c
@@ -204,11 +204,11 @@ static esp_err_t panel_st77922_del(esp_lcd_panel_t *panel)
 {
     st77922_panel_t *st77922 = (st77922_panel_t *)panel->user_data;
 
+    // Delete MIPI DPI panel
+    ESP_RETURN_ON_ERROR(st77922->del(panel), TAG, "del st77922 panel failed");
     if (st77922->reset_gpio_num >= 0) {
         gpio_reset_pin(st77922->reset_gpio_num);
     }
-    // Delete MIPI DPI panel
-    st77922->del(panel);
     ESP_LOGD(TAG, "del st77922 panel @%p", st77922);
     free(st77922);
 
diff --git a/components/display/lcd/esp_lcd_st77922/esp_lcd_st77922_rgb.c b/components/display/lcd/esp_lcd_st77922/esp_lcd_st77922_rgb.c
@@ -323,11 +323,11 @@ static esp_err_t panel_st77922_del(esp_lcd_panel_t *panel)
 {
     st77922_panel_t *st77922 = (st77922_panel_t *)panel->user_data;
 
+    // Delete RGB panel
+    ESP_RETURN_ON_ERROR(st77922->del(panel), TAG, "del st77922 panel failed");
     if (st77922->reset_gpio_num >= 0) {
         gpio_reset_pin(st77922->reset_gpio_num);
     }
-    // Delete RGB panel
-    st77922->del(panel);
     free(st77922);
     ESP_LOGD(TAG, "del st77922 panel @%p", st77922);
     return ESP_OK;
diff --git a/components/display/lcd/esp_lcd_st77922/idf_component.yml b/components/display/lcd/esp_lcd_st77922/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.4"
+version: "1.0.5"
 description: ESP LCD ST77922(SPI & QSPI & RGB & MIPI-DSI)
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/display/lcd/esp_lcd_st77922
 repository: https://github.com/espressif/esp-iot-solution.git

Original file line number	Diff line number	Diff line change
`@@ -154,11 +154,11 @@ static esp_err_t panel_co5300_del(esp_lcd_panel_t *panel)`
`154`	`154`	`{`
`155`	`155`	`co5300_panel_t co5300 = (co5300_panel_t )panel->user_data;`
`156`	`156`
	`157`	`+ // Delete MIPI DPI panel`
	`158`	`+ ESP_RETURN_ON_ERROR(co5300->del(panel), TAG, "del co5300 panel failed");`
`157`	`159`	`if (co5300->reset_gpio_num >= 0) {`
`158`	`160`	`gpio_reset_pin(co5300->reset_gpio_num);`
`159`	`161`	`}`
`160`		`- // Delete MIPI DPI panel`
`161`		`- co5300->del(panel);`
`162`	`162`	`ESP_LOGD(TAG, "del co5300 panel @%p", co5300);`
`163`	`163`	`free(co5300);`
`164`	`164`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: "1.0.1"`
	`1`	`+version: "1.0.2"`
`2`	`2`	`description: ESP LCD CO5300(SPI & QSPI & MIPI-DSI)`
`3`	`3`	`url: https://github.com/espressif/esp-iot-solution/tree/master/components/display/lcd/esp_lcd_co5300`
`4`	`4`	`repository: https://github.com/espressif/esp-iot-solution.git`
Original file line number	Diff line number	Diff line change
`@@ -191,11 +191,11 @@ static esp_err_t panel_ek79007_del(esp_lcd_panel_t *panel)`
`191`	`191`	`{`
`192`	`192`	`ek79007_panel_t ek79007 = (ek79007_panel_t )panel->user_data;`
`193`	`193`
	`194`	`+ // Delete MIPI DPI panel`
	`195`	`+ ESP_RETURN_ON_ERROR(ek79007->del(panel), TAG, "del ek79007 panel failed");`
`194`	`196`	`if (ek79007->reset_gpio_num >= 0) {`
`195`	`197`	`gpio_reset_pin(ek79007->reset_gpio_num);`
`196`	`198`	`}`
`197`		`- // Delete MIPI DPI panel`
`198`		`- ek79007->del(panel);`
`199`	`199`	`ESP_LOGD(TAG, "del ek79007 panel @%p", ek79007);`
`200`	`200`	`free(ek79007);`
`201`	`201`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: "1.0.3"`
	`1`	`+version: "1.0.4"`
`2`	`2`	`targets:`
`3`	`3`	`- esp32p4`
`4`	`4`	`description: ESP LCD EK79007(MIPI-DSI)`
Original file line number	Diff line number	Diff line change
`@@ -168,11 +168,11 @@ static esp_err_t panel_hx8399_del(esp_lcd_panel_t *panel)`
`168`	`168`	`{`
`169`	`169`	`hx8399_panel_t hx8399 = (hx8399_panel_t )panel->user_data;`
`170`	`170`
	`171`	`+ // Delete MIPI DPI panel`
	`172`	`+ ESP_RETURN_ON_ERROR(hx8399->del(panel), TAG, "del hx8399 panel failed");`
`171`	`173`	`if (hx8399->reset_gpio_num >= 0) {`
`172`	`174`	`gpio_reset_pin(hx8399->reset_gpio_num);`
`173`	`175`	`}`
`174`		`- // Delete MIPI DPI panel`
`175`		`- hx8399->del(panel);`
`176`	`176`	`ESP_LOGD(TAG, "del hx8399 panel @%p", hx8399);`
`177`	`177`	`free(hx8399);`
`178`	`178`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: "1.0.4"`
	`1`	`+version: "1.0.5"`
`2`	`2`	`targets:`
`3`	`3`	`- esp32p4`
`4`	`4`	`description: ESP LCD HX8399 (MIPI-DSI)`