diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 03:21:35 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 03:21:35 +0200 |
| commit | 2f093e2aa466d799c0952bfd1c6c68ff5d80fc17 (patch) | |
| tree | e3d511aca536b7123d256b98a0ef8e74fc219498 /drivers/net/wireless/mwifiex/cfg80211.c | |
| parent | misc: tsl2550: Use dev_pm_ops (diff) | |
| parent | Linux 3.9-rc7 (diff) | |
| download | linux-2f093e2aa466d799c0952bfd1c6c68ff5d80fc17.tar.xz linux-2f093e2aa466d799c0952bfd1c6c68ff5d80fc17.zip | |
Merge 3.9-rc7 into char-misc-next
We want the fixes in there.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/mwifiex/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index a44023a7bd57..8aaf56ade4d9 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -1892,7 +1892,8 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, } } - for (i = 0; i < request->n_channels; i++) { + for (i = 0; i < min_t(u32, request->n_channels, + MWIFIEX_USER_SCAN_CHAN_MAX); i++) { chan = request->channels[i]; priv->user_scan_cfg->chan_list[i].chan_number = chan->hw_value; priv->user_scan_cfg->chan_list[i].radio_type = chan->band; |