diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-10-27 18:00:21 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-10-27 18:00:21 +0300 |
| commit | e604d9124b4c9b405e058a8495f28ce6a652efb2 (patch) | |
| tree | 3d998a07c57132166c0265aac9b97458153dc3f4 /drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | |
| parent | 67f0160fe34ec5391a428603b9832c9f99d8f3a1 (diff) | |
| parent | 5a143db8c4a28dab6423cb6197e9f1389da375f2 (diff) | |
| download | linux-e604d9124b4c9b405e058a8495f28ce6a652efb2.tar.bz2 | |
Merge tag 'iwlwifi-for-kalle-2015-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
* some fixes for suspend/resume with unified FW images;
* a fix for a false-positive lockdep report;
* a fix for multi-queue that caused an unnecessary 1 second latency;
* a fix for an ACPI parsing bug that caused a misleading error message;
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c index 07da4efe8458..7b7d2a146e30 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c @@ -1529,8 +1529,8 @@ static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf, .data = { &cmd, }, .len = { sizeof(cmd) }, }; - size_t delta, len; - ssize_t ret; + size_t delta; + ssize_t ret, len; hcmd.id = iwl_cmd_id(*ppos >> 24 ? UMAC_RD_WR : LMAC_RD_WR, DEBUG_GROUP, 0); |