Skip to content

Commit 6852aaa

Browse files
committed
Merge branch 'bugfix/lcd_spi_acquire_bus_v4.4' into 'release/v4.4'
spi_lcd: don't release bus if acquire failed (v4.4) See merge request espressif/esp-idf!23038
2 parents d337d9d + 1a61181 commit 6852aaa

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

components/esp_lcd/src/esp_lcd_panel_io_spi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -144,7 +144,7 @@ static esp_err_t panel_io_spi_register_event_callbacks(esp_lcd_panel_io_handle_t
144144
esp_lcd_panel_io_spi_t *spi_panel_io = __containerof(io, esp_lcd_panel_io_spi_t, base);
145145

146146
if (spi_panel_io->on_color_trans_done != NULL) {
147-
ESP_LOGW(TAG, "Callback on_color_trans_done was already set and now it was owerwritten!");
147+
ESP_LOGW(TAG, "Callback on_color_trans_done was already set and now it was overwritten!");
148148
}
149149

150150
spi_panel_io->on_color_trans_done = cbs->on_color_trans_done;
@@ -189,7 +189,7 @@ static esp_err_t panel_io_spi_tx_param(esp_lcd_panel_io_t *io, int lcd_cmd, cons
189189
esp_lcd_panel_io_spi_t *spi_panel_io = __containerof(io, esp_lcd_panel_io_spi_t, base);
190190
bool send_cmd = (lcd_cmd >= 0);
191191

192-
spi_device_acquire_bus(spi_panel_io->spi_dev, portMAX_DELAY);
192+
ESP_RETURN_ON_ERROR(spi_device_acquire_bus(spi_panel_io->spi_dev, portMAX_DELAY), TAG, "acquire spi bus failed");
193193

194194
// before issue a polling transaction, need to wait queued transactions finished
195195
size_t num_trans_inflight = spi_panel_io->num_trans_inflight;
@@ -249,7 +249,7 @@ static esp_err_t panel_io_spi_rx_param(esp_lcd_panel_io_t *io, int lcd_cmd, void
249249
esp_lcd_panel_io_spi_t *spi_panel_io = __containerof(io, esp_lcd_panel_io_spi_t, base);
250250
bool send_cmd = (lcd_cmd >= 0);
251251

252-
spi_device_acquire_bus(spi_panel_io->spi_dev, portMAX_DELAY);
252+
ESP_RETURN_ON_ERROR(spi_device_acquire_bus(spi_panel_io->spi_dev, portMAX_DELAY), TAG, "acquire spi bus failed");
253253

254254
// before issue a polling transaction, need to wait queued transactions finished
255255
size_t num_trans_inflight = spi_panel_io->num_trans_inflight;

0 commit comments

Comments
 (0)