Commit 7d03f5a4 authored by Jason Wang's avatar Jason Wang Committed by David S. Miller

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: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e22d043
...@@ -1589,7 +1589,7 @@ static int cp_set_mac_address(struct net_device *dev, void *p) ...@@ -1589,7 +1589,7 @@ static int cp_set_mac_address(struct net_device *dev, void *p)
No extra delay is needed with 33Mhz PCI, but 66Mhz may change this. No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
*/ */
#define eeprom_delay() readl(ee_addr) #define eeprom_delay() readb(ee_addr)
/* The EEPROM commands include the alway-set leading bit. */ /* The EEPROM commands include the alway-set leading bit. */
#define EE_EXTEND_CMD (4) #define EE_EXTEND_CMD (4)
......
...@@ -1122,7 +1122,7 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev) ...@@ -1122,7 +1122,7 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev)
No extra delay is needed with 33Mhz PCI, but 66Mhz may change this. No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
*/ */
#define eeprom_delay() (void)RTL_R32(Cfg9346) #define eeprom_delay() (void)RTL_R8(Cfg9346)
/* The EEPROM commands include the alway-set leading bit. */ /* The EEPROM commands include the alway-set leading bit. */
#define EE_WRITE_CMD (5) #define EE_WRITE_CMD (5)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment