mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
[PATCH] e1000: Fix EEPROM read logic
Fixed read_eeprom logic to test use_eerd instead of testing for 82573 controllers. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
526f99572e
commit
4d351858e4
1 changed files with 10 additions and 8 deletions
|
@ -3888,14 +3888,16 @@ e1000_read_eeprom(struct e1000_hw *hw,
|
|||
return -E1000_ERR_EEPROM;
|
||||
}
|
||||
|
||||
/* FLASH reads without acquiring the semaphore are safe in 82573-based
|
||||
* controllers.
|
||||
*/
|
||||
if ((e1000_is_onboard_nvm_eeprom(hw) == TRUE) ||
|
||||
(hw->mac_type != e1000_82573)) {
|
||||
/* Prepare the EEPROM for reading */
|
||||
if(e1000_acquire_eeprom(hw) != E1000_SUCCESS)
|
||||
return -E1000_ERR_EEPROM;
|
||||
/* FLASH reads without acquiring the semaphore are safe */
|
||||
if (e1000_is_onboard_nvm_eeprom(hw) == TRUE &&
|
||||
hw->eeprom.use_eerd == FALSE) {
|
||||
switch (hw->mac_type) {
|
||||
default:
|
||||
/* Prepare the EEPROM for reading */
|
||||
if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
|
||||
return -E1000_ERR_EEPROM;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(eeprom->use_eerd == TRUE) {
|
||||
|
|
Loading…
Reference in a new issue