Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 7ff3423edb9c0d6a4788a7301f437c8c871dc00d..c29c5fb3aecf7cae7ba1a7d88077d3e17105ff62 100644 (file)
--- 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);