projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d3bd1b4
)
r8169: fix incorrect args to oob notify.
author
Hayes Wang
<
[email protected]
>
Tue, 22 Feb 2011 09:26:20 +0000
(17:26 +0800)
committer
Francois Romieu
<
[email protected]
>
Wed, 23 Feb 2011 22:30:30 +0000
(23:30 +0100)
It results in the wrong point address and influences RTL8168DP.
Signed-off-by: Hayes Wang <
[email protected]
>
Acked-by: Francois Romieu <
[email protected]
>
drivers/net/r8169.c
patch
|
blob
|
history
diff --git
a/drivers/net/r8169.c
b/drivers/net/r8169.c
index 469ab0b7ce315bb0c5ad8c71f481fc893448e849..550c865896490f3e7250e5d08a81fa036909f0e8 100644
(file)
--- a/
drivers/net/r8169.c
+++ b/
drivers/net/r8169.c
@@
-617,8
+617,9
@@
static void ocp_write(struct rtl8169_private *tp, u8 mask, u16 reg, u32 data)
}
}
-static void rtl8168_oob_notify(
void __iomem *ioaddr
, u8 cmd)
+static void rtl8168_oob_notify(
struct rtl8169_private *tp
, u8 cmd)
{
+ void __iomem *ioaddr = tp->mmio_addr;
int i;
RTL_W8(ERIDR, cmd);
@@
-630,7
+631,7
@@
static void rtl8168_oob_notify(void __iomem *ioaddr, u8 cmd)
break;
}
- ocp_write(
ioaddr
, 0x1, 0x30, 0x00000001);
+ ocp_write(
tp
, 0x1, 0x30, 0x00000001);
}
#define OOB_CMD_RESET 0x00