From 7a2cc8db50b801d9a384959a5b6c663559c139dd Mon Sep 17 00:00:00 2001 From: Sergio Paracuellos Date: Wed, 25 Apr 2018 16:01:42 +0200 Subject: [PATCH] staging: ks7010: refactor ks_wlan_set_scan_type function This commit changes logic to handle invalid values first and just assign valid ones afterwards. Signed-off-by: Sergio Paracuellos Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ks7010/ks_wlan_net.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index e2e72cd7e457..e943d372c393 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -1940,14 +1940,11 @@ static int ks_wlan_set_scan_type(struct net_device *dev, if (priv->sleep_mode == SLP_SLEEP) return -EPERM; /* for SLEEP MODE */ - if (*uwrq == ACTIVE_SCAN) { /* 0 */ - priv->reg.scan_type = ACTIVE_SCAN; - } else if (*uwrq == PASSIVE_SCAN) { /* 1 */ - priv->reg.scan_type = PASSIVE_SCAN; - } else { + + if (*uwrq != ACTIVE_SCAN && *uwrq != PASSIVE_SCAN) return -EINVAL; - } + priv->reg.scan_type = *uwrq; return 0; } -- 2.30.2