aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2016-03-18 12:20:48 -0400
committerKalle Valo <kvalo@codeaurora.org>2016-04-06 14:39:23 -0400
commite32993eb3aed598790ba0c581796c357898bd8f0 (patch)
treef6d9b932bf1413c8b194fd5286b203dda118082a
parent466414a084a90a15b81601bdde0c5803dc061ecd (diff)
wl12xx: remove redundant null check on wl->scan.ssid
ssid is an array of u8, so it can never be null, so the null check on wl->scan.ssid is redundant and can be removed. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/ti/wl12xx/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wl12xx/scan.c b/drivers/net/wireless/ti/wl12xx/scan.c
index ebed13af9852..a0dfc59e9644 100644
--- a/drivers/net/wireless/ti/wl12xx/scan.c
+++ b/drivers/net/wireless/ti/wl12xx/scan.c
@@ -149,7 +149,7 @@ static int wl1271_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
149 else 149 else
150 cmd->params.band = WL1271_SCAN_BAND_5_GHZ; 150 cmd->params.band = WL1271_SCAN_BAND_5_GHZ;
151 151
152 if (wl->scan.ssid_len && wl->scan.ssid) { 152 if (wl->scan.ssid_len) {
153 cmd->params.ssid_len = wl->scan.ssid_len; 153 cmd->params.ssid_len = wl->scan.ssid_len;
154 memcpy(cmd->params.ssid, wl->scan.ssid, wl->scan.ssid_len); 154 memcpy(cmd->params.ssid, wl->scan.ssid, wl->scan.ssid_len);
155 } 155 }