Merge tag 'char-misc-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[karo-tx-linux.git] / drivers / net / wireless / intel / iwlwifi / iwl-io.c

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
index 9c8b09cf1f7bb89d9895b22bfca58aff95b2334d..c527b8c103700136c70f12068c5b7bf5a96be8d5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
@@ -241,12 +241,12 @@ IWL_EXPORT_SYMBOL(iwl_clear_bits_prph);
 
 void iwl_force_nmi(struct iwl_trans *trans)
 {
-       if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) {
+       if (trans->cfg->device_family < IWL_DEVICE_FAMILY_8000) {
                iwl_write_prph(trans, DEVICE_SET_NMI_REG,
                               DEVICE_SET_NMI_VAL_DRV);
                iwl_write_prph(trans, DEVICE_SET_NMI_REG,
                               DEVICE_SET_NMI_VAL_HW);
-       } else if (trans->cfg->gen2) {
+       } else if (trans->cfg->device_family == IWL_DEVICE_FAMILY_A000) {
                iwl_write_prph(trans, UREG_NIC_SET_NMI_DRIVER,
                               DEVICE_SET_NMI_8000_VAL);
        } else {