From 7bcbd2b5cf8fbf26a6539583a04566af9204ee16 Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Fri, 30 Dec 2011 23:44:33 +0000 Subject: [PATCH] --- yaml --- r: 279162 b: refs/heads/master c: 7d03f5a48e4d90854275b06433626243b3b3db17 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/realtek/8139cp.c | 2 +- trunk/drivers/net/ethernet/realtek/8139too.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aa12181f9180..10c2c1ddad20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e22d0437e6dea36c867b08ceb224c1cc98a45ab +refs/heads/master: 7d03f5a48e4d90854275b06433626243b3b3db17 diff --git a/trunk/drivers/net/ethernet/realtek/8139cp.c b/trunk/drivers/net/ethernet/realtek/8139cp.c index 87cff10f7be7..886e6bec971a 100644 --- a/trunk/drivers/net/ethernet/realtek/8139cp.c +++ b/trunk/drivers/net/ethernet/realtek/8139cp.c @@ -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. */ -#define eeprom_delay() readl(ee_addr) +#define eeprom_delay() readb(ee_addr) /* The EEPROM commands include the alway-set leading bit. */ #define EE_EXTEND_CMD (4) diff --git a/trunk/drivers/net/ethernet/realtek/8139too.c b/trunk/drivers/net/ethernet/realtek/8139too.c index d9c72273e428..a8779bedb3d9 100644 --- a/trunk/drivers/net/ethernet/realtek/8139too.c +++ b/trunk/drivers/net/ethernet/realtek/8139too.c @@ -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. */ -#define eeprom_delay() (void)RTL_R32(Cfg9346) +#define eeprom_delay() (void)RTL_R8(Cfg9346) /* The EEPROM commands include the alway-set leading bit. */ #define EE_WRITE_CMD (5)