From 74db5ed2de0cb61c3df0518e77be9b8d4c71d1b7 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Thu, 8 Nov 2007 23:23:21 +0100 Subject: [PATCH] --- yaml --- r: 73469 b: refs/heads/master c: a6baf3af89a266a3d745117de570788b956396e7 h: refs/heads/master i: 73467: abe5c8c0ddd664507d0c4824d1afd0aa8b526014 v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f3f490eacd6e..78e633adb547 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50d84c2dc00e48ff9ba018ed0dd23276cf79e566 +refs/heads/master: a6baf3af89a266a3d745117de570788b956396e7 diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index f9ba2e478a69..1f647b9ce352 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -470,7 +470,7 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) { int i; - RTL_W32(PHYAR, 0x80000000 | (reg_addr & 0xFF) << 16 | value); + RTL_W32(PHYAR, 0x80000000 | (reg_addr & 0x1f) << 16 | (value & 0xffff)); for (i = 20; i > 0; i--) { /* @@ -487,7 +487,7 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr) { int i, value = -1; - RTL_W32(PHYAR, 0x0 | (reg_addr & 0xFF) << 16); + RTL_W32(PHYAR, 0x0 | (reg_addr & 0x1f) << 16); for (i = 20; i > 0; i--) { /* @@ -495,7 +495,7 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr) * the specified MII register. */ if (RTL_R32(PHYAR) & 0x80000000) { - value = (int) (RTL_R32(PHYAR) & 0xFFFF); + value = RTL_R32(PHYAR) & 0xffff; break; } udelay(25);