diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2011-12-17 08:32:57 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-01-26 18:58:33 -0800 |
| commit | c8243ee0488d9bc12995ca7ea02f651db820622e (patch) | |
| tree | 841b3a567f3d948e3a788aadf55e828aa6fbebfa /drivers | |
| parent | 058e8edd11fb2c694c3c6c9fd8407439eb3eb954 (diff) | |
| download | linux-3.10-c8243ee0488d9bc12995ca7ea02f651db820622e.tar.gz linux-3.10-c8243ee0488d9bc12995ca7ea02f651db820622e.tar.bz2 linux-3.10-c8243ee0488d9bc12995ca7ea02f651db820622e.zip | |
e1000e: call er16flash() instead of __er16flash()
__er16flash() is not meant to be called directly.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index 53e5447cbbc..070a90f78aa 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -2279,7 +2279,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw) * cycle has a chance to end before giving up. */ for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) { - hsfsts.regval = __er16flash(hw, ICH_FLASH_HSFSTS); + hsfsts.regval = er16flash(ICH_FLASH_HSFSTS); if (hsfsts.hsf_status.flcinprog == 0) { ret_val = 0; break; |