aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2007-11-08 17:23:21 -0500
committerJeff Garzik <jeff@garzik.org>2007-11-10 04:25:16 -0500
commita6baf3af89a266a3d745117de570788b956396e7 (patch)
tree212182ba7e535d0e566b3579b536ffa7b6cb7b74 /drivers/net
parent50d84c2dc00e48ff9ba018ed0dd23276cf79e566 (diff)
r8169: prevent bit sign expansion error in mdio_write
Oops. The current code does not like being given an u16 with the highest bit set as an argument to mdio_write. Let's enforce a correct range of values for both the register address and value (resp. 5 and 16 bits). The callers are currently left as-is. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Edward Hsu <edward_hsu@realtek.com.tw>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/r8169.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index f9ba2e478a69..1f647b9ce352 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -470,7 +470,7 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value)
470{ 470{
471 int i; 471 int i;
472 472
473 RTL_W32(PHYAR, 0x80000000 | (reg_addr & 0xFF) << 16 | value); 473 RTL_W32(PHYAR, 0x80000000 | (reg_addr & 0x1f) << 16 | (value & 0xffff));
474 474
475 for (i = 20; i > 0; i--) { 475 for (i = 20; i > 0; i--) {
476 /* 476 /*
@@ -487,7 +487,7 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr)
487{ 487{
488 int i, value = -1; 488 int i, value = -1;
489 489
490 RTL_W32(PHYAR, 0x0 | (reg_addr & 0xFF) << 16); 490 RTL_W32(PHYAR, 0x0 | (reg_addr & 0x1f) << 16);
491 491
492 for (i = 20; i > 0; i--) { 492 for (i = 20; i > 0; i--) {
493 /* 493 /*
@@ -495,7 +495,7 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr)
495 * the specified MII register. 495 * the specified MII register.
496 */ 496 */
497 if (RTL_R32(PHYAR) & 0x80000000) { 497 if (RTL_R32(PHYAR) & 0x80000000) {
498 value = (int) (RTL_R32(PHYAR) & 0xFFFF); 498 value = RTL_R32(PHYAR) & 0xffff;
499 break; 499 break;
500 } 500 }
501 udelay(25); 501 udelay(25);