diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debugfs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 68b04f5b10ce..6bf6845e1a51 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -234,11 +234,12 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file, | |||
234 | 234 | ||
235 | /* default is to dump the entire data segment */ | 235 | /* default is to dump the entire data segment */ |
236 | if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) { | 236 | if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) { |
237 | struct iwl_trans *trans = trans(priv); | ||
237 | priv->dbgfs_sram_offset = 0x800000; | 238 | priv->dbgfs_sram_offset = 0x800000; |
238 | if (priv->ucode_type == IWL_UCODE_INIT) | 239 | if (trans->shrd->ucode_type == IWL_UCODE_INIT) |
239 | priv->dbgfs_sram_len = trans(priv)->ucode_init.data.len; | 240 | priv->dbgfs_sram_len = trans->ucode_init.data.len; |
240 | else | 241 | else |
241 | priv->dbgfs_sram_len = trans(priv)->ucode_rt.data.len; | 242 | priv->dbgfs_sram_len = trans->ucode_rt.data.len; |
242 | } | 243 | } |
243 | len = priv->dbgfs_sram_len; | 244 | len = priv->dbgfs_sram_len; |
244 | 245 | ||
@@ -415,7 +416,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, | |||
415 | return -ENODATA; | 416 | return -ENODATA; |
416 | } | 417 | } |
417 | 418 | ||
418 | ptr = priv->eeprom; | 419 | ptr = priv->shrd->eeprom; |
419 | if (!ptr) { | 420 | if (!ptr) { |
420 | IWL_ERR(priv, "Invalid EEPROM/OTP memory\n"); | 421 | IWL_ERR(priv, "Invalid EEPROM/OTP memory\n"); |
421 | return -ENOMEM; | 422 | return -ENOMEM; |
@@ -427,7 +428,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, | |||
427 | IWL_ERR(priv, "Can not allocate Buffer\n"); | 428 | IWL_ERR(priv, "Can not allocate Buffer\n"); |
428 | return -ENOMEM; | 429 | return -ENOMEM; |
429 | } | 430 | } |
430 | eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION); | 431 | eeprom_ver = iwl_eeprom_query16(priv->shrd, EEPROM_VERSION); |
431 | pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s, " | 432 | pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s, " |
432 | "version: 0x%x\n", | 433 | "version: 0x%x\n", |
433 | (trans(priv)->nvm_device_type == NVM_DEVICE_TYPE_OTP) | 434 | (trans(priv)->nvm_device_type == NVM_DEVICE_TYPE_OTP) |