diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-09 13:41:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 13:41:11 -0500 |
| commit | e29ec6247053ad60bd0b36f155b647364a615097 (patch) | |
| tree | dc74d48f7e0c548d51d4561b3a750a47eb1cdaea /drivers/net/wireless/wl12xx | |
| parent | 1a6422f67fbf691cf8721076619aeead9183403d (diff) | |
| parent | cc438fccd5783c9f7b4c4858358ac897dcf8a58d (diff) | |
Merge branch 'master' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/wl12xx')
| -rw-r--r-- | drivers/net/wireless/wl12xx/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c index 128ccb79318c..fc29c671cf3b 100644 --- a/drivers/net/wireless/wl12xx/scan.c +++ b/drivers/net/wireless/wl12xx/scan.c @@ -559,7 +559,7 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl, break; } /* Fail if SSID isn't present in the filters */ - if (j == req->n_ssids) { + if (j == cmd->n_ssids) { ret = -EINVAL; goto out_free; } |