Message ID | 20180507141200.25957-2-jesse.sung@canonical.com |
---|---|
State | New |
Headers | show |
Series | [Xenial,v2,1/3] Revert "UBUNTU: SAUCE: mwifiex: do not dereference invalid pointer" | expand |
diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/mwifiex/cfp.c index 47eb72546272..09fae27140f7 100644 --- a/drivers/net/wireless/mwifiex/cfp.c +++ b/drivers/net/wireless/mwifiex/cfp.c @@ -324,9 +324,7 @@ mwifiex_get_cfp(struct mwifiex_private *priv, u8 band, u16 channel, u32 freq) if (mwifiex_band_to_radio_type(band) == HostCmd_SCAN_RADIO_TYPE_BG) sband = priv->wdev.wiphy->bands[IEEE80211_BAND_2GHZ]; else - sband = priv->wdev.wiphy ? - priv->wdev.wiphy->bands[IEEE80211_BAND_5GHZ] : - NULL; + sband = priv->wdev.wiphy->bands[IEEE80211_BAND_5GHZ]; if (!sband) { mwifiex_dbg(priv->adapter, ERROR,
BugLink: https://launchpad.net/bugs/1769671 This reverts the workaround commit 8a034f97a28dba62026343eef7992766c91273a7 for integrating the fix. Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com> --- drivers/net/wireless/mwifiex/cfp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)