diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-11 04:28:36 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-11 04:28:36 -0400 |
| commit | 4e01df28d45464d82894bc7e3b551fc8e59fb76e (patch) | |
| tree | b04e0b329bf0908780007da60d860b4483624c96 | |
| parent | 04c9f416e371cff076a8b3279fb213628915d059 (diff) | |
| parent | 5f8bcce99e83b1155954b1ae7291dc754ad9025e (diff) | |
Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 4 |
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) | |||
| 6753 | msleep(1); | 6753 | msleep(1); |
| 6754 | RTL_W8(MCU, RTL_R8(MCU) & ~NOW_IS_OOB); | 6754 | RTL_W8(MCU, RTL_R8(MCU) & ~NOW_IS_OOB); |
| 6755 | 6755 | ||
| 6756 | data = r8168_mac_ocp_read(ioaddr, 0xe8de); | 6756 | data = r8168_mac_ocp_read(tp, 0xe8de); |
| 6757 | data &= ~(1 << 14); | 6757 | data &= ~(1 << 14); |
| 6758 | r8168_mac_ocp_write(tp, 0xe8de, data); | 6758 | r8168_mac_ocp_write(tp, 0xe8de, data); |
| 6759 | 6759 | ||
| 6760 | if (!rtl_udelay_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42)) | 6760 | if (!rtl_udelay_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42)) |
| 6761 | return; | 6761 | return; |
| 6762 | 6762 | ||
| 6763 | data = r8168_mac_ocp_read(ioaddr, 0xe8de); | 6763 | data = r8168_mac_ocp_read(tp, 0xe8de); |
| 6764 | data |= (1 << 15); | 6764 | data |= (1 << 15); |
| 6765 | r8168_mac_ocp_write(tp, 0xe8de, data); | 6765 | r8168_mac_ocp_write(tp, 0xe8de, data); |
| 6766 | 6766 | ||