diff options
| author |   hayeswang <hayeswang@realtek.com> | 2016-06-30 15:33:35 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-07-01 05:56:39 -0400 |
| commit | f95ae8a0edba1cb85110df4f1c96786419a0472f (patch) | |
| tree | 0b113856bff2249b54821c7202c9d5cfdc65d475 /drivers/net/usb | |
| parent | qlcnic: add wmb() call in transmit data path. (diff) | |
| download | linux-dev-f95ae8a0edba1cb85110df4f1c96786419a0472f.tar.xz linux-dev-f95ae8a0edba1cb85110df4f1c96786419a0472f.zip | |
r8152: clear LINK_OFF_WAKE_EN after autoresume
LINK_OFF_WAKE_EN should be cleared after autoresume, otherwise after
system suspend, the system would wake up when linking off occurs.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 4e257b8d8f3e..d7f20a9b4b9a 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -2421,7 +2421,18 @@ static void rtl_runtime_suspend_enable(struct r8152 *tp, bool enable) ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); } else { + u32 ocp_data; + __rtl_set_wol(tp, tp->saved_wolopts); + + ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); + + ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34); + ocp_data &= ~LINK_OFF_WAKE_EN; + ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data); + + ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); + r8153_u2p3en(tp, true); r8153_u1u2en(tp, true); } |