diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2007-11-08 23:23:21 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-11-10 04:25:16 -0500 |
| commit | a6baf3af89a266a3d745117de570788b956396e7 (patch) | |
| tree | 212182ba7e535d0e566b3579b536ffa7b6cb7b74 /drivers/net/r8169.c | |
| parent | 50d84c2dc00e48ff9ba018ed0dd23276cf79e566 (diff) | |
| download | op-kernel-dev-a6baf3af89a266a3d745117de570788b956396e7.zip op-kernel-dev-a6baf3af89a266a3d745117de570788b956396e7.tar.gz | |
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/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index f9ba2e4..1f647b9 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) { 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); |
