diff options
| author | Arend van Spriel <arend@broadcom.com> | 2012-11-05 16:22:10 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:55:42 -0500 |
| commit | 2cb941c0474e3037e9ad4ee219d4c848ad519ac0 (patch) | |
| tree | c292a9b5ef62088c1f29493e3ff1483bf13e6b7a | |
| parent | 3d3726d25635a63764c4f324176873124f8a02b6 (diff) | |
brcmfmac: simplify if-else condition in brcmf_cfg80211_escan()
Code flow was:
err = foo();
if (!err)
return err;
else
goto exit;
return 0;
Changed it to just to exit label if err is non-zero.
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index 9da9d05e1df..f05ab77db57 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c @@ -966,9 +966,7 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct net_device *ndev, set_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status); if (escan_req) { err = brcmf_do_escan(cfg, wiphy, ndev, request); - if (!err) - return err; - else + if (err) goto scan_out; } else { WL_SCAN("ssid \"%s\", ssid_len (%d)\n", |