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,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 A78E8CA9EAF for ; Sun, 27 Oct 2019 21:30:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70E8D208C0 for ; Sun, 27 Oct 2019 21:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211808; bh=HZt28qeJ9roEqr1pQ7f0oFDZLmYIjlhJZ2bgYQLGM9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JE3dM47Ni7Y+E9kjpvhXUacADxL4HJselRx2jSbDtIUeysLECBbJuKOeQjW3+pADR Y4mgf+87eAsAdI5oPMSttLJQBO91lws81+YG1EsmZoKSUapW6D39Hw/Wjk54cDnNad cQI6WFv3bOynFx8kqsqQZj24iFmzWfr5Xjme3mm0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731446AbfJ0VTT (ORCPT ); Sun, 27 Oct 2019 17:19:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:39608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731418AbfJ0VTS (ORCPT ); Sun, 27 Oct 2019 17:19:18 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 22449214E0; Sun, 27 Oct 2019 21:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211157; bh=HZt28qeJ9roEqr1pQ7f0oFDZLmYIjlhJZ2bgYQLGM9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2hwAM38N9Pq/nbyaw0cu3kPTSkOHjVb1IGrdfcyfXeXnZlRqp8UDlgmQ96Vx3ID8Y UWt9/qq5fVSQalJyVz1AEXxYBhduclDXngv3IT6flvKdE8u6rAJELp0gpmsmbO/X2i 2x4ps6HQhsCUTvqVW+kuB/dedYINoFUEuxGenCQQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai-Heng Feng , "David S. Miller" , Sasha Levin Subject: [PATCH 5.3 053/197] r8152: Set macpassthru in reset_resume callback Date: Sun, 27 Oct 2019 21:59:31 +0100 Message-Id: <20191027203354.543257012@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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: Kai-Heng Feng [ Upstream commit a54cdeeb04fc719e4c7f19d6e28dba7ea86cee5b ] r8152 may fail to establish network connection after resume from system suspend. If the USB port connects to r8152 lost its power during system suspend, the MAC address was written before is lost. The reason is that The MAC address doesn't get written again in its reset_resume callback. So let's set MAC address again in reset_resume callback. Also remove unnecessary lock as no other locking attempt will happen during reset_resume. Signed-off-by: Kai-Heng Feng Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/r8152.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 04137ac373b07..9eedc0714422c 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -4533,10 +4533,9 @@ static int rtl8152_reset_resume(struct usb_interface *intf) struct r8152 *tp = usb_get_intfdata(intf); clear_bit(SELECTIVE_SUSPEND, &tp->flags); - mutex_lock(&tp->control); tp->rtl_ops.init(tp); queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0); - mutex_unlock(&tp->control); + set_ethernet_addr(tp); return rtl8152_resume(intf); } -- 2.20.1