diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-10-27 16:53:39 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-10-27 16:53:39 +0300 |
| commit | 9b09342f5cfa5b4b3447de17de284111bfdeab26 (patch) | |
| tree | c71fcb17aecf0f77fb8e24f48feb07482f3cff77 /drivers/net/ethernet/intel/i40e/i40e_nvm.c | |
| parent | b9e43e363d0115ca981c106d968e24140ad37f6c (diff) | |
| parent | 0224d45c9d46401b6d7018a96cfe049c5da7d91c (diff) | |
| download | linux-9b09342f5cfa5b4b3447de17de284111bfdeab26.tar.xz | |
Merge branch 'i2c/cht-wc-fusb302-immutable' into i2c/for-4.15
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_nvm.c')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_nvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c index 57505b1df98d..d591b3e6bd7c 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c +++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c @@ -298,7 +298,7 @@ static i40e_status i40e_read_nvm_word_aq(struct i40e_hw *hw, u16 offset, } /** - * __i40e_read_nvm_word - Reads nvm word, assumes called does the locking + * __i40e_read_nvm_word - Reads nvm word, assumes caller does the locking * @hw: pointer to the HW structure * @offset: offset of the Shadow RAM word to read (0x000000 - 0x001FFF) * @data: word read from the Shadow RAM |