aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_hw.c
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2006-01-12 19:50:48 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 07:44:50 -0500
commit4d351858e41145fa236730b7749e3aed18edef43 (patch)
treeecab4b750bc11feadcd5400bdbd516d0aa5a5c6b /drivers/net/e1000/e1000_hw.c
parent526f99572e9f18f42c8da2c9adafbe64482c0737 (diff)
[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>
Diffstat (limited to 'drivers/net/e1000/e1000_hw.c')
-rw-r--r--drivers/net/e1000/e1000_hw.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index bb9d00e0dc14..19a0b2a6ada1 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -3888,14 +3888,16 @@ e1000_read_eeprom(struct e1000_hw *hw,
3888 return -E1000_ERR_EEPROM; 3888 return -E1000_ERR_EEPROM;
3889 } 3889 }
3890 3890
3891 /* FLASH reads without acquiring the semaphore are safe in 82573-based 3891 /* FLASH reads without acquiring the semaphore are safe */
3892 * controllers. 3892 if (e1000_is_onboard_nvm_eeprom(hw) == TRUE &&
3893 */ 3893 hw->eeprom.use_eerd == FALSE) {
3894 if ((e1000_is_onboard_nvm_eeprom(hw) == TRUE) || 3894 switch (hw->mac_type) {
3895 (hw->mac_type != e1000_82573)) { 3895 default:
3896 /* Prepare the EEPROM for reading */ 3896 /* Prepare the EEPROM for reading */
3897 if(e1000_acquire_eeprom(hw) != E1000_SUCCESS) 3897 if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
3898 return -E1000_ERR_EEPROM; 3898 return -E1000_ERR_EEPROM;
3899 break;
3900 }
3899 } 3901 }
3900 3902
3901 if(eeprom->use_eerd == TRUE) { 3903 if(eeprom->use_eerd == TRUE) {