e1000e: minor correction to name of bit in CTRL_EXT register
authorBruce Allan <bruce.w.allan@intel.com>
Tue, 8 Dec 2009 07:27:41 +0000 (07:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Dec 2009 04:10:11 +0000 (20:10 -0800)
Bit 7 in the CTRL_REG register is actually the Software Definable Pin 3,
not the Software Definable Pin 7.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/e1000e/defines.h
drivers/net/e1000e/netdev.c

index 86d2809763c3600dd808ab12b79b860b61adf9d0..e02e38221ed47c9ab428a7aec033c16ac97e2584 100644 (file)
@@ -74,7 +74,7 @@
 #define E1000_WUS_BC           E1000_WUFC_BC
 
 /* Extended Device Control */
-#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Definable Pin 7 */
+#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
 #define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
 #define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */
 #define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */
index c3105c5087e05d5ed81e991b026ac0cc128f6b5c..762b697ce7310d37d497cd2c169bd52497faf5fb 100644 (file)
@@ -4541,7 +4541,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
                    e1000_media_type_internal_serdes) {
                        /* keep the laser running in D3 */
                        ctrl_ext = er32(CTRL_EXT);
-                       ctrl_ext |= E1000_CTRL_EXT_SDP7_DATA;
+                       ctrl_ext |= E1000_CTRL_EXT_SDP3_DATA;
                        ew32(CTRL_EXT, ctrl_ext);
                }