diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-08 09:03:10 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-08 09:03:10 -0500 |
| commit | c1f3bb6bd317994beb3af7bbec4bf54ed0035509 (patch) | |
| tree | 878833c714ddcb35f1574f2b11e1f69d1130d206 /drivers/net/wireless/iwlwifi/mvm/debugfs.c | |
| parent | dcd607718385d02ce3741de225927a57f528f93b (diff) | |
| parent | 3c57e865cfb2dcbb48fdfa08e7d4e3479e9b40f0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/debugfs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/debugfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c index 0675f0c8ef93..9864d713eb2c 100644 --- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c | |||
| @@ -342,6 +342,7 @@ static void iwl_dbgfs_update_pm(struct iwl_mvm *mvm, | |||
| 342 | case MVM_DEBUGFS_PM_DISABLE_POWER_OFF: | 342 | case MVM_DEBUGFS_PM_DISABLE_POWER_OFF: |
| 343 | IWL_DEBUG_POWER(mvm, "disable_power_off=%d\n", val); | 343 | IWL_DEBUG_POWER(mvm, "disable_power_off=%d\n", val); |
| 344 | dbgfs_pm->disable_power_off = val; | 344 | dbgfs_pm->disable_power_off = val; |
| 345 | break; | ||
| 345 | case MVM_DEBUGFS_PM_LPRX_ENA: | 346 | case MVM_DEBUGFS_PM_LPRX_ENA: |
| 346 | IWL_DEBUG_POWER(mvm, "lprx %s\n", val ? "enabled" : "disabled"); | 347 | IWL_DEBUG_POWER(mvm, "lprx %s\n", val ? "enabled" : "disabled"); |
| 347 | dbgfs_pm->lprx_ena = val; | 348 | dbgfs_pm->lprx_ena = val; |