diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-12-05 17:11:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-12-05 17:11:48 +1000 |
| commit | f03ee46be9401e3434f52bb15e92d1e640f76438 (patch) | |
| tree | f0a1819bd3e44902578b80e1a03d1dde1c6099b8 /drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | |
| parent | 0d5320fc194128a1a584a7e91a606cb3af2ded80 (diff) | |
| parent | 3e5de27e940d00d8d504dfb96625fb654f641509 (diff) | |
| download | linux-f03ee46be9401e3434f52bb15e92d1e640f76438.tar.bz2 | |
Backmerge tag 'v4.9-rc8' into drm-next
Linux 4.9-rc8
Daniel requested this so we could apply some follow on fixes cleanly to -next.
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); |