leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

8139cp/8139too: do not read into reserved registers

Browse Source 
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>
This commit is contained in:
Jason Wang 2011-12-30 23:44:33 +00:00 committed by David S. Miller
parent 0e22d0437e
commit 7d03f5a48e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/realtek/8139cp.c
View File

@ -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)

2
drivers/net/ethernet/realtek/8139too.c
View File

@ -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)