diff options
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/main.c')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c index e61265af92cd..92e4eaf32ff2 100644 --- a/drivers/net/wireless/iwmc3200wifi/main.c +++ b/drivers/net/wireless/iwmc3200wifi/main.c | |||
@@ -701,12 +701,12 @@ static int __iwm_up(struct iwm_priv *iwm) | |||
701 | 701 | ||
702 | /* | 702 | /* |
703 | * Read our SKU capabilities. | 703 | * Read our SKU capabilities. |
704 | * If it's valid, we overwrite the wireless mode conf entry and the | 704 | * If it's valid, we AND the configured wireless mode with the |
705 | * current profile one. | 705 | * device EEPROM value as the current profile wireless mode. |
706 | */ | 706 | */ |
707 | wireless_mode = iwm_eeprom_wireless_mode(iwm); | 707 | wireless_mode = iwm_eeprom_wireless_mode(iwm); |
708 | if (wireless_mode) { | 708 | if (wireless_mode) { |
709 | iwm->conf.wireless_mode = wireless_mode; | 709 | iwm->conf.wireless_mode &= wireless_mode; |
710 | if (iwm->umac_profile) | 710 | if (iwm->umac_profile) |
711 | iwm->umac_profile->wireless_mode = | 711 | iwm->umac_profile->wireless_mode = |
712 | iwm->conf.wireless_mode; | 712 | iwm->conf.wireless_mode; |