Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / drivers / net / wireless / intel / iwlwifi / pcie / drv.c

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 84f4ba01e14fa2e84878dc75fda5d050e3500880..2126b9adbb08360b78d5c44312bf22ec78a9eb21 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -825,11 +825,11 @@ static int iwl_pci_resume(struct device *device)
        /*
         * Enable rfkill interrupt (in order to keep track of the rfkill
         * status). Must be locked to avoid processing a possible rfkill
-        * interrupt while in iwl_trans_check_hw_rf_kill().
+        * interrupt while in iwl_pcie_check_hw_rf_kill().
         */
        mutex_lock(&trans_pcie->mutex);
        iwl_enable_rfkill_int(trans);
-       iwl_trans_check_hw_rf_kill(trans);
+       iwl_pcie_check_hw_rf_kill(trans);
        mutex_unlock(&trans_pcie->mutex);
 
        return 0;