aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2011-12-30 18:44:33 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-03 12:47:50 -0500
commit7d03f5a48e4d90854275b06433626243b3b3db17 (patch)
treea37d7f0cf1ccdb2336034def156e0e95558eeab3 /drivers/net
parent0e22d0437e6dea36c867b08ceb224c1cc98a45ab (diff)
8139cp/8139too: do not read into reserved registers
delay_eeprom() use long read for Cfg9346 register(offset 0x50) which may read into the area of reserved register(offset 0x53). Use byte read instead. Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/realtek/8139cp.c2
-rw-r--r--drivers/net/ethernet/realtek/8139too.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 87cff10f7be7..886e6bec971a 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -1589,7 +1589,7 @@ static int cp_set_mac_address(struct net_device *dev, void *p)
1589 No extra delay is needed with 33Mhz PCI, but 66Mhz may change this. 1589 No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
1590 */ 1590 */
1591 1591
1592#define eeprom_delay() readl(ee_addr) 1592#define eeprom_delay() readb(ee_addr)
1593 1593
1594/* The EEPROM commands include the alway-set leading bit. */ 1594/* The EEPROM commands include the alway-set leading bit. */
1595#define EE_EXTEND_CMD (4) 1595#define EE_EXTEND_CMD (4)
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index d9c72273e428..a8779bedb3d9 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -1122,7 +1122,7 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev)
1122 No extra delay is needed with 33Mhz PCI, but 66Mhz may change this. 1122 No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
1123 */ 1123 */
1124 1124
1125#define eeprom_delay() (void)RTL_R32(Cfg9346) 1125#define eeprom_delay() (void)RTL_R8(Cfg9346)
1126 1126
1127/* The EEPROM commands include the alway-set leading bit. */ 1127/* The EEPROM commands include the alway-set leading bit. */
1128#define EE_WRITE_CMD (5) 1128#define EE_WRITE_CMD (5)