From 61ea875c9479a0a013ccd313edfbbf0c4e2bc15d Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Wed, 12 Aug 2020 14:16:11 +0800 Subject: [PATCH] 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 --- 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 10e8dd51df..b93568507c 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 c5447b5c49..4d3adec639 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 */