diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-04-23 14:16:57 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-04-23 14:17:34 +0100 |
| commit | 39157ec04095ab012d11db23c462844634bfbb8f (patch) | |
| tree | 643f83dc46445aa7834fe271ce2c21a5cb278cee /drivers/net/i40e/base/i40e_nvm.c | |
| parent | 47d9763a1dd3103d732da9eec350cfc1cd784717 (diff) | |
New upstream version 16.11.5upstream/16.11.5
Change-Id: I47171042629a57c6958d50251351e668ca5f3d8b
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/i40e/base/i40e_nvm.c')
| -rw-r--r-- | drivers/net/i40e/base/i40e_nvm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c index 4fa1220b..4976b1ff 100644 --- a/drivers/net/i40e/base/i40e_nvm.c +++ b/drivers/net/i40e/base/i40e_nvm.c @@ -221,7 +221,8 @@ enum i40e_status_code i40e_read_nvm_word(struct i40e_hw *hw, u16 offset, #ifdef X722_SUPPORT if (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE) { - ret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ); + if (hw->flags & I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK) + ret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ); if (!ret_code) { ret_code = i40e_read_nvm_word_aq(hw, offset, data); i40e_release_nvm(hw); |