From: Chaehyun Lim Date: Fri, 2 Oct 2015 12:44:53 +0000 (+0900) Subject: staging: wilc1000: fix return type of host_int_wait_msg_queue_idle X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=244efb1f5df5589c98bc1d0d1850c896151b9caa;p=openwrt%2Fstaging%2Fblogic.git staging: wilc1000: fix return type of host_int_wait_msg_queue_idle This patch changes return type of host_int_wait_msg_queue_idle from s32 to int. s32Error gets return value from wilc_mq_send that has return type of int. It should be changed return type of host_int_wait_msg_queue_idle by int as well as data type of s32Error. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 4f683c90a50e..2777229d95b5 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -5342,9 +5342,9 @@ int host_int_set_mac_chnl_num(tstrWILC_WFIDrv *wfi_drv, u8 channel) } -s32 host_int_wait_msg_queue_idle(void) +int host_int_wait_msg_queue_idle(void) { - s32 s32Error = 0; + int s32Error = 0; struct host_if_msg msg; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index edcaf5aa0b47..bc8acdebff89 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -648,7 +648,7 @@ s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress); * @date 19 march 2014 * @version 1.0 */ -s32 host_int_wait_msg_queue_idle(void); +int host_int_wait_msg_queue_idle(void); /** * @brief sets a start scan request