X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Ftulip%2Fmedia.c;h=6fa873a5974ec9ea174bb94eeb44dc3368d68803;hb=f1227cd3e0e73c48b93368800aa89f4341103a00;hp=919c40cd635cbb9a0286f0486e706a0c5e1aeb16;hpb=340e2b1a4c74f653454348914c408420d5d3c28a;p=linux-2.6.git

diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index 919c40cd6..6fa873a59 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -88,7 +88,7 @@ int tulip_mdio_read(struct net_device *dev, int phy_id, int location)
 		value = ioread32(ioaddr + CSR9);
 		iowrite32(value & 0xFFEFFFFF, ioaddr + CSR9);
 		
-		value = (phy_id << 21) | (location << 16) | 0x08000000;
+		value = (phy_id << 21) | (location << 16) | 0x8000000;
 		iowrite32(value, ioaddr + CSR10);
 		
 		while(--i > 0) {
@@ -166,7 +166,7 @@ void tulip_mdio_write(struct net_device *dev, int phy_id, int location, int val)
 		value = ioread32(ioaddr + CSR9);
 		iowrite32(value & 0xFFEFFFFF, ioaddr + CSR9);
 		
-		value = (phy_id << 21) | (location << 16) | 0x04000000 | (val & 0xFFFF);
+		value = (phy_id << 21) | (location << 16) | 0x4000000 | (val & 0xFFFF);
 		iowrite32(value, ioaddr + CSR10);
 		
 		while(--i > 0) {
@@ -174,7 +174,6 @@ void tulip_mdio_write(struct net_device *dev, int phy_id, int location, int val)
 				break;
 		}
 		spin_unlock_irqrestore(&tp->mii_lock, flags);
-		return;
 	}
 		
 	/* Establish sync by sending 32 logic ones. */