diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-26 10:32:13 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-26 10:32:13 -0400 |
| commit | 330ee00412bbaefa7d0597a1bed7804e818ba91c (patch) | |
| tree | 0d086857f4e704f4945463e87e76ebf8ae32cad8 /drivers/net/wireless/brcm80211 | |
| parent | 3da3fff8006c608f19a51859d44ba47ca8b41461 (diff) | |
| parent | f89ff6441df06abc2d95f3ef67525923032d6283 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/brcm80211')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index 411dfe7c7ff0..a6f1e8166008 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | |||
| @@ -3569,7 +3569,7 @@ brcmf_cfg80211_sched_scan_start(struct wiphy *wiphy, | |||
| 3569 | 3569 | ||
| 3570 | if (!request || !request->n_ssids || !request->n_match_sets) { | 3570 | if (!request || !request->n_ssids || !request->n_match_sets) { |
| 3571 | WL_ERR("Invalid sched scan req!! n_ssids:%d\n", | 3571 | WL_ERR("Invalid sched scan req!! n_ssids:%d\n", |
| 3572 | request->n_ssids); | 3572 | request ? request->n_ssids : 0); |
| 3573 | return -EINVAL; | 3573 | return -EINVAL; |
| 3574 | } | 3574 | } |
| 3575 | 3575 | ||