Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3075477ybt; Mon, 29 Jun 2020 14:40:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwf8iR7VsxHwOEB30sGmAxXt9qL6szC2MOUhKz8iM8aml3bUIgswj2ZbmuoVRBbxea/1/c9 X-Received: by 2002:a05:6402:796:: with SMTP id d22mr20710831edy.78.1593466814900; Mon, 29 Jun 2020 14:40:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593466814; cv=none; d=google.com; s=arc-20160816; b=pJPxdxS9d3Nji0/iEeZtUt7WSYYDQXeP6yRwz+2mkPJXWp1T4+UhL0KNxiubQs6OZs MpziL6kSADvmusodWEe7AUDCQKwLm03xYtikGV4z4DDcH/3X3qjtdLAzgyzyOxmGhtDT FF7IV8oy7SsBBmmRodBUpGRCoqdqq2J0b0px/t6kOXNbou2lR6Sh3wqfyIlUgZeM1EzV mFdFGs+MnJqMo37oHQC9R4yvHPyALV+ArR6qblFBz+qe2l6lDOy8buKEGo6WY+AevWIU h46So1baz88HIwrMIbG7izpjGCVfNWFgq13hMmeiPjKy+okxyRmq9PK3gCLrxAOs+vxO Kokw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TQtAuHZ7aVSUHCs16PpsLOZD3d17JXI/YeruDPxtGjE=; b=gycYM3twaUL6OJFfHV6fD4PWL+TY9B84b3zmPgfsQXoBgKipE3NK5zlOzBp+RKcvqZ a+PWdM3mHUIggYyu2/RzcJNCf7jepdjmD5LGTPGQmHRKtRahAUN7Q7PYqILK+skyhgsz gCaCOmV+TFdXwbZ+sEmOXmF3yj0s4qUkErsolkPdu2TxUpKsclg6HCXcVDezZRLR0uO7 MgIiaXE1KOPu5w5F9a9sZcTKjbl16aBVnAOn7jKlpzK+IW918Jr7amjSXPui2nDLatMi 5LdMxVRV91PM9FmWd3GJqMfZYDzcGbVLIgVY70f1+GW6dZ6EmIxArFu6uo62P8lxBAa1 8Wmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1OdjMbDn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id zh8si504720ejb.305.2020.06.29.14.39.51; Mon, 29 Jun 2020 14:40:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1OdjMbDn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729667AbgF2VjR (ORCPT + 99 others); Mon, 29 Jun 2020 17:39:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:60652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728280AbgF2Skb (ORCPT ); Mon, 29 Jun 2020 14:40:31 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 242832415F; Mon, 29 Jun 2020 15:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593443942; bh=eV1hwMrZg/nVMqycfjegu4dbxpDijmSyrwC/bRAfnqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1OdjMbDnjB9s4LKIz2Ox0KvUw7tje7N1AC1AGksLj+QybNVvlnIQLmKLNRsc3L5LD rzMllGK1DB5zWBsmaqogooRyXfxrB+nzco/FlzgO8PHNTTdhMtVpLIhmUh2Oy/8b45 nLMI4gjK9FNwbTVCpemc7VRBBjMZpSyKF7LdmeQQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Claudiu Beznea , "David S . Miller" , Greg Kroah-Hartman Subject: [PATCH 5.7 044/265] net: macb: call pm_runtime_put_sync on failure path Date: Mon, 29 Jun 2020 11:14:37 -0400 Message-Id: <20200629151818.2493727-45-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Claudiu Beznea [ Upstream commit 0eaf228d574bd82a9aed73e3953bfb81721f4227 ] Call pm_runtime_put_sync() on failure path of at91ether_open. Fixes: e6a41c23df0d ("net: macb: ensure interface is not suspended on at91rm9200") Signed-off-by: Claudiu Beznea Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/cadence/macb_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 257c4920cb886..5705359a36124 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -3837,7 +3837,7 @@ static int at91ether_open(struct net_device *dev) ret = at91ether_start(dev); if (ret) - return ret; + goto pm_exit; /* Enable MAC interrupts */ macb_writel(lp, IER, MACB_BIT(RCOMP) | @@ -3850,11 +3850,15 @@ static int at91ether_open(struct net_device *dev) ret = macb_phylink_connect(lp); if (ret) - return ret; + goto pm_exit; netif_start_queue(dev); return 0; + +pm_exit: + pm_runtime_put_sync(&lp->pdev->dev); + return ret; } /* Close the interface */ -- 2.25.1