summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHayes Wang <hayeswang@realtek.com>2011-02-22 17:26:20 +0800
committerFrancois Romieu <romieu@fr.zoreil.com>2011-02-23 23:30:30 +0100
commitfac5b3caa1f5bc07ecfb4f5ce98f8112638dc8fb (patch)
treeaad10272c0f67c6b163ad87744488081acf13e6b /drivers
parentd3bd1b4c89cceca42211cd5bd30508b903267229 (diff)
downloadlinux-fac5b3caa1f5bc07ecfb4f5ce98f8112638dc8fb.tar.gz
linux-fac5b3caa1f5bc07ecfb4f5ce98f8112638dc8fb.tar.bz2
linux-fac5b3caa1f5bc07ecfb4f5ce98f8112638dc8fb.zip
r8169: fix incorrect args to oob notify.
It results in the wrong point address and influences RTL8168DP. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/r8169.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 469ab0b7ce31..550c86589649 100644
--- 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