r8152: clear LINK_OFF_WAKE_EN after autoresume
authorhayeswang <hayeswang@realtek.com>
Thu, 30 Jun 2016 07:33:35 +0000 (15:33 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Jul 2016 09:56:39 +0000 (05:56 -0400)
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>
drivers/net/usb/r8152.c

index 4e257b8d8f3e37e616e9ea5b5bf0de3d037bae90..d7f20a9b4b9a83befd149c1be56dffa3b8a1d6c9 100644 (file)
@@ -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);
        }