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=-13.0 required=3.0 tests=BAYES_00,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 CD873C433EC for ; Mon, 20 Jul 2020 15:58:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4BFA20734 for ; Mon, 20 Jul 2020 15:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260695; bh=7mPeL6q5fqzI+QggGUNvC3bQjLzT8Ro3i8ISN2AzR1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=J9WMGsRdcb763U3QGvpYgnrgzIUvCtJgQpy1BaOPhgcpBUx/YRuykW7EuzyH+23tQ 6ckfpZm/BrKynXU0+7lhh8SxdX6BbVX9Z7Mcf96MBkrrn//hYxSsc1z8Tn+WXt0qBg abDu7O0ZhamDi5iHGr1G/Y/7oB6KqomszTMJ2c+4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731749AbgGTP6H (ORCPT ); Mon, 20 Jul 2020 11:58:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:58260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731991AbgGTP6H (ORCPT ); Mon, 20 Jul 2020 11:58:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 3EE9A206E9; Mon, 20 Jul 2020 15:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260686; bh=7mPeL6q5fqzI+QggGUNvC3bQjLzT8Ro3i8ISN2AzR1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A5KXijEqwTiLI06rRJYuu+1Rhmd7AWjpu6bOTWCKrVTu5IJIYPO4hgqQnkZCOfMzK 66adA54VyAtCVwlDR/OgrX6++msgbDdadEsTNQYAwBAMU+DSc2gaw6PYZysanMeDVa 8tH8gEBKOg62kl2OdC5kohZ8XBuDwRVUpeTTEG+k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Claudiu Beznea , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 058/215] net: macb: call pm_runtime_put_sync on failure path Date: Mon, 20 Jul 2020 17:35:40 +0200 Message-Id: <20200720152822.973921309@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152820.122442056@linuxfoundation.org> References: <20200720152820.122442056@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 [ 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: Sasha Levin --- drivers/net/ethernet/cadence/macb_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 01ed4d4296db2..a5c4d4d66df35 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -3708,7 +3708,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) | @@ -3725,6 +3725,10 @@ static int at91ether_open(struct net_device *dev) netif_start_queue(dev); return 0; + +pm_exit: + pm_runtime_put_sync(&lp->pdev->dev); + return ret; } /* Close the interface */ -- 2.25.1