summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChaehyun Lim <chaehyun.lim@gmail.com>2016-02-11 04:46:22 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-12 03:31:50 (GMT)
commit6e944459aa868a274d07a50b3c7b774387624d94 (patch)
tree17cd27f359c7e1ab29c6a21ff67a40321a11e5ba
parentd99ee289b4acf29770a33f76c7f98b466f70e91d (diff)
downloadlinux-6e944459aa868a274d07a50b3c7b774387624d94.tar.xz
staging: wilc1000: fix return type of wilc_send_config_pkt
wilc_send_config_pkt is returned 0 or -ETIMEDOUT according to return value of wilc_wlan_cfg_set or wilc_wlan_cfg_set. It is better to use int type to represent linux standard error code. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wilc1000/wilc_wlan.c5
-rw-r--r--drivers/staging/wilc1000/wilc_wlan.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 98b21d4..2bc2970 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1349,10 +1349,11 @@ int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size)
return ret;
}
-s32 wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids,
+int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids,
u32 count, u32 drv)
{
- s32 counter = 0, ret = 0;
+ s32 counter = 0;
+ int ret = 0;
if (mode == GET_CFG) {
for (counter = 0; counter < count; counter++) {
diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index d362fa8..06d02ab 100644
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -301,6 +301,6 @@ void host_sleep_notify(struct wilc *wilc);
extern bool wilc_enable_ps;
void chip_allow_sleep(struct wilc *wilc);
void chip_wakeup(struct wilc *wilc);
-s32 wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids,
+int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids,
u32 count, u32 drv);
#endif