summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/pcie/drv.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-03-18 16:55:28 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-03-18 16:55:28 -0400
commitaa4a625088f9117f3bebfc21943c3d5d8a4cf81e (patch)
treef8ca315db51fa142920983f18160047c4d179d43 /drivers/net/wireless/iwlwifi/pcie/drv.c
parent2df3b0b7869688c511eada859f1ee3dc13c7cec6 (diff)
parenta82dda6cd492b8c88952be6f6527f3656f7ac585 (diff)
downloadlinux-aa4a625088f9117f3bebfc21943c3d5d8a4cf81e.tar.bz2
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/drv.c')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/drv.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index 1f97631a82e4..edb015c99049 100644
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -447,7 +447,8 @@ static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev)
pxsx_handle = ACPI_HANDLE(&pdev->dev);
if (!pxsx_handle) {
- IWL_ERR(trans, "Could not retrieve root port ACPI handle");
+ IWL_DEBUG_INFO(trans,
+ "Could not retrieve root port ACPI handle");
return;
}
@@ -559,7 +560,7 @@ static int iwl_pci_resume(struct device *device)
iwl_enable_rfkill_int(trans);
hw_rfkill = iwl_is_rfkill_set(trans);
- iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
+ iwl_trans_pcie_rf_kill(trans, hw_rfkill);
return 0;
}