diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-04 20:45:14 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-04 20:45:14 +0100 |
| commit | 01925efdf7e03b4b803b5c9f985163d687f7f017 (patch) | |
| tree | 6c318f9bf002efac5ccd87e8edad35863d72bd17 /drivers/net/wireless/mwifiex/cmdevt.c | |
| parent | rt2x00: rt2800pci: use module_pci_driver macro (diff) | |
| parent | drivers: net: wireless: b43: Fix possible NULL ptr dereference (diff) | |
| download | linux-01925efdf7e03b4b803b5c9f985163d687f7f017.tar.xz linux-01925efdf7e03b4b803b5c9f985163d687f7f017.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/pcie/drv.c
Diffstat (limited to 'drivers/net/wireless/mwifiex/cmdevt.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/cmdevt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c index fb3fa18390b8..e47f4e3012b8 100644 --- a/drivers/net/wireless/mwifiex/cmdevt.c +++ b/drivers/net/wireless/mwifiex/cmdevt.c @@ -1155,7 +1155,7 @@ int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv, uint32_t conditions = le32_to_cpu(phs_cfg->params.hs_config.conditions); if (phs_cfg->action == cpu_to_le16(HS_ACTIVATE) && - adapter->iface_type == MWIFIEX_SDIO) { + adapter->iface_type != MWIFIEX_USB) { mwifiex_hs_activated_event(priv, true); return 0; } else { @@ -1167,8 +1167,7 @@ int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv, } if (conditions != HS_CFG_CANCEL) { adapter->is_hs_configured = true; - if (adapter->iface_type == MWIFIEX_USB || - adapter->iface_type == MWIFIEX_PCIE) + if (adapter->iface_type == MWIFIEX_USB) mwifiex_hs_activated_event(priv, true); } else { adapter->is_hs_configured = false; |