summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-04 04:02:17 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-04 05:37:37 +0100
commit886ae1fa1380309d91cdb7e67bd4bf71e053c1d5 (patch)
treecef5c0ffb7750cc1ed8577b1a4cfee4d0f98a040 /drivers
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff)
downloadlinux-886ae1fa1380309d91cdb7e67bd4bf71e053c1d5.tar.xz
linux-886ae1fa1380309d91cdb7e67bd4bf71e053c1d5.zip
[PATCH] fix rtl8150
That code doesn't do what its author apparently thought it would do... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/net/rtl8150.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
index e0eecda78ec1..670262a38a0f 100644
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
@@ -284,7 +284,8 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
u8 data[3], tmp;
data[0] = phy;
- *(data + 1) = cpu_to_le16p(&reg);
+ data[1] = reg & 0xff;
+ data[2] = (reg >> 8) & 0xff;
tmp = indx | PHY_WRITE | PHY_GO;
i = 0;