You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by da...@apache.org on 2020/08/12 09:12:10 UTC
[incubator-nuttx] branch master updated: Fix build break introduced
by commit a0ce81d65914fdedab4f7418442e3fdc12331b71
This is an automated email from the ASF dual-hosted git repository.
davids5 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 61ea875 Fix build break introduced by commit a0ce81d65914fdedab4f7418442e3fdc12331b71
61ea875 is described below
commit 61ea875c9479a0a013ccd313edfbbf0c4e2bc15d
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Aug 12 14:16:11 2020 +0800
Fix build break introduced by commit a0ce81d65914fdedab4f7418442e3fdc12331b71
sam_ili9488.c:1605:7: error: label 'errout_with_dmadog' used but not defined
bcmf_sdio.c:855:16: error: passing argument 1 of 'wd_start' from incompatible pointer type
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/samv7/samv71-xult/src/sam_ili9488.c | 2 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
index 10e8dd5..b935685 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
@@ -1602,7 +1602,7 @@ int board_lcd_initialize(void)
if (ret < 0)
{
lcderr("ERROR: sam_poweroff failed: %d\n", ret);
- goto errout_with_dmadog;
+ goto errout_with_dmach;
}
return OK;
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h
index c5447b5..4d3adec 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h
@@ -105,7 +105,7 @@ struct bcmf_sdio_dev_s
int thread_id; /* Processing thread id */
sem_t thread_signal; /* Semaphore for processing thread event */
- struct wdog_s *waitdog; /* Processing thread waitdog */
+ struct wdog_s waitdog; /* Processing thread waitdog */
uint32_t backplane_current_addr; /* Current function 1 backplane base addr */