e1000e: use correct type for read of 32-bit register
authorBruce Allan <bruce.w.allan@intel.com>
Fri, 17 Aug 2012 06:17:51 +0000 (06:17 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 31 Aug 2012 02:07:28 +0000 (19:07 -0700)
The POEMB register is 32 bits, not 16.

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>
drivers/net/ethernet/intel/e1000e/82571.c

index 080c89093feb5df6393c6d8f58421ff254f2b05d..c98586408005a0dbbb557e4ae22fc3f49ba04a48 100644 (file)
@@ -653,7 +653,7 @@ static void e1000_put_hw_semaphore_82574(struct e1000_hw *hw)
  **/
 static s32 e1000_set_d0_lplu_state_82574(struct e1000_hw *hw, bool active)
 {
-       u16 data = er32(POEMB);
+       u32 data = er32(POEMB);
 
        if (active)
                data |= E1000_PHY_CTRL_D0A_LPLU;
@@ -677,7 +677,7 @@ static s32 e1000_set_d0_lplu_state_82574(struct e1000_hw *hw, bool active)
  **/
 static s32 e1000_set_d3_lplu_state_82574(struct e1000_hw *hw, bool active)
 {
-       u16 data = er32(POEMB);
+       u32 data = er32(POEMB);
 
        if (!active) {
                data &= ~E1000_PHY_CTRL_NOND0A_LPLU;