projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
net
/
usb
/
dm9601.c
diff --git
a/drivers/net/usb/dm9601.c
b/drivers/net/usb/dm9601.c
index
291add2
..
47634b6
100644
(file)
--- a/
drivers/net/usb/dm9601.c
+++ b/
drivers/net/usb/dm9601.c
@@
-240,7
+240,7
@@
static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 valu
goto out;
dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg);
- dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1
c : 0x14
);
+ dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1
a : 0x12
);
for (i = 0; i < DM_TIMEOUT; i++) {
u8 tmp;