From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC166C3F68F for ; Mon, 3 Feb 2020 16:22:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8805A2080C for ; Mon, 3 Feb 2020 16:22:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580746929; bh=dLIUR+VZmrm/gIu/yX/ujMq5lchU8vxchxD+Xk1gRUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HzWsG9eLashDjN7VlDEK553TtldqBgNYmO3cjDxJkm4MU0covfK1df1HW7bOkN2pF AoevbDYACgEOI+Ar2na9ooWCZFqoLXaiO2MF/Zt2GF/jg0EoAI7afTPOrfCWz+6kG1 mwOhl4zbA8AGzmPrtIJdURVYBnOCDL6kJGyCBb8Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729230AbgBCQV6 (ORCPT ); Mon, 3 Feb 2020 11:21:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:34060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729215AbgBCQV5 (ORCPT ); Mon, 3 Feb 2020 11:21:57 -0500 Received: from localhost (unknown [104.132.45.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4B66E2080C; Mon, 3 Feb 2020 16:21:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580746916; bh=dLIUR+VZmrm/gIu/yX/ujMq5lchU8vxchxD+Xk1gRUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vnC4ASfL/Wh5pezPh/pl7DwD75qYXHj3MsSGU5EK7qvvd5dPzKOdUia5UphX+wOnd YXf0I0H1SKuJuDhSFaAcVTJ6d/ltzNE4LktkSLAVhVlEz4oGDSrK6T8LqaigjVnAUw 5dKx8OiGs76MLg76jVwnMUDFf/WtOnB92Dt6brt4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hayes Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 44/53] r8152: get default setting of WOL before initializing Date: Mon, 3 Feb 2020 16:19:36 +0000 Message-Id: <20200203161910.635921752@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200203161902.714326084@linuxfoundation.org> References: <20200203161902.714326084@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hayes Wang [ Upstream commit 9583a3638dc07cc1878f41265e85ed497f72efcb ] Initailization would reset runtime suspend by tp->saved_wolopts, so the tp->saved_wolopts should be set before initializing. Signed-off-by: Hayes Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/r8152.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index db8b489b0513c..23e299c86b814 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -4313,6 +4313,11 @@ static int rtl8152_probe(struct usb_interface *intf, intf->needs_remote_wakeup = 1; + if (!rtl_can_wakeup(tp)) + __rtl_set_wol(tp, 0); + else + tp->saved_wolopts = __rtl_get_wol(tp); + tp->rtl_ops.init(tp); set_ethernet_addr(tp); @@ -4325,10 +4330,6 @@ static int rtl8152_probe(struct usb_interface *intf, goto out1; } - if (!rtl_can_wakeup(tp)) - __rtl_set_wol(tp, 0); - - tp->saved_wolopts = __rtl_get_wol(tp); if (tp->saved_wolopts) device_set_wakeup_enable(&udev->dev, true); else -- 2.20.1