summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHayes Wang2012-07-10 08:47:05 +0200
committerFrancois Romieu2012-07-10 08:49:36 +0200
commit5f8bcce99e83b1155954b1ae7291dc754ad9025e (patch)
tree325af5a24c65e203427d9bc29d7fc92135ccf645
parentMerge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux (diff)
downloadkernel-qcow2-linux-5f8bcce99e83b1155954b1ae7291dc754ad9025e.tar.gz
kernel-qcow2-linux-5f8bcce99e83b1155954b1ae7291dc754ad9025e.tar.xz
kernel-qcow2-linux-5f8bcce99e83b1155954b1ae7291dc754ad9025e.zip
r8169: fix argument in rtl_hw_init_8168g.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
-rw-r--r--drivers/net/ethernet/realtek/r8169.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 7ff3423edb9c..c29c5fb3aecf 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -6753,14 +6753,14 @@ static void __devinit rtl_hw_init_8168g(struct rtl8169_private *tp)
msleep(1);
RTL_W8(MCU, RTL_R8(MCU) & ~NOW_IS_OOB);
- data = r8168_mac_ocp_read(ioaddr, 0xe8de);
+ data = r8168_mac_ocp_read(tp, 0xe8de);
data &= ~(1 << 14);
r8168_mac_ocp_write(tp, 0xe8de, data);
if (!rtl_udelay_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42))
return;
- data = r8168_mac_ocp_read(ioaddr, 0xe8de);
+ data = r8168_mac_ocp_read(tp, 0xe8de);
data |= (1 << 15);
r8168_mac_ocp_write(tp, 0xe8de, data);