From patchwork Wed Nov 30 14:29:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 701036 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tTNFy3ZpMz9tB1 for ; Thu, 1 Dec 2016 01:33:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="xsQfagqb"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758096AbcK3Odc (ORCPT ); Wed, 30 Nov 2016 09:33:32 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33497 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757873AbcK3Ocg (ORCPT ); Wed, 30 Nov 2016 09:32:36 -0500 Received: by mail-lf0-f68.google.com with SMTP id 98so15952380lfs.0; Wed, 30 Nov 2016 06:32:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MCF1ZHoY7XNAQURB3/owI86LMdjUBvoSeRtK1LmdOp4=; b=xsQfagqb/iRsYfmHymJDAQ5xKXgkEJkkNUj9un34Aqrf/YGNDnhKJ5xQmbwDyDRu3F SNZv9iUx30VHurTLjO7F/Z2m90WxBxQfnMSrEMBymofrR2oZTug4/4UeJknOQn6W9Np5 qioy5NjNx3Ov9ObE4JjBl/AmBmVKuTC/hpPXTL4FWQ9C/wXBlRSzX59WdmSNTjAbWZLI 7MMgGmvcKh6Hh6ozVFcOl5cAWc6rt/UaNuhuOknV+l7pmIPd93qMfhymztin3nXLfuPN ejVRHIqIpAcBGhSe2Un9Ymd43QmlU8ROp389Xl4gPdgpTt57owoHBdYCYJfF6XVQpBmN t5eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=MCF1ZHoY7XNAQURB3/owI86LMdjUBvoSeRtK1LmdOp4=; b=QaWHgRQKlVdBqOjxcLuDkKpJQJx8IJGLfaTS9/gAcyv4WP9PHykUcKPtwezR1njGf5 OB1tGN4jw7u0WKyZGp8g+8mfWkWu7k4hBfe5mlFKeVpc2Em9qDLUm41y15wDqhQMmGDI B1sau8+MPGGK/Cp8BE3FwsAzwAFZKEof7OY/jL8QbBToPULghaYyf4Uw29CbCfcQS2Y5 m9xX4Ca2ahzB0osC1EBXUXTUuA9ptncGuW5k0EAij6WFbv22VabUs1wxkDbNYXpgl4/q E2bqwEtUgmk5C9AshQEL/UI5ndHLZHwEchK5CADCiyf1r7Mdcgq6JK+aVivdBLoBu8Zj SChA== X-Gm-Message-State: AKaTC004STEzkWoh4Rykim+a0K7b1WmnCJ6wCj98YpEyN5lb95eqBjuaWQA6csIyWtPEbA== X-Received: by 10.25.79.70 with SMTP id a6mr887448lfk.99.1480516354801; Wed, 30 Nov 2016 06:32:34 -0800 (PST) Received: from xi.terra (c-04aadb54.07-184-6d6c6d4.cust.bredbandsbolaget.se. [84.219.170.4]) by smtp.gmail.com with ESMTPSA id 34sm14504012lja.25.2016.11.30.06.32.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Nov 2016 06:32:32 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1cC5vw-0007EQ-N8; Wed, 30 Nov 2016 15:32:28 +0100 From: Johan Hovold To: "David S. Miller" Cc: Giuseppe Cavallaro , Alexandre Torgue , Joachim Eastwood , Carlo Caione , Kevin Hilman , Maxime Coquelin , Maxime Ripard , Chen-Yu Tsai , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH net 5/7] net: ethernet: stmmac: dwmac-meson8b: fix probe error path Date: Wed, 30 Nov 2016 15:29:53 +0100 Message-Id: <1480516195-27696-6-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1480516195-27696-1-git-send-email-johan@kernel.org> References: <1480516195-27696-1-git-send-email-johan@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sure to disable clocks before returning on late probe errors. Fixes: 566e82516253 ("net: stmmac: add a glue driver for the Amlogic Meson 8b / GXBB DWMAC") Signed-off-by: Johan Hovold Acked-by: Kevin Hilman --- drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c index 250e4ceafc8d..45e7aaf0170d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c @@ -289,7 +289,16 @@ static int meson8b_dwmac_probe(struct platform_device *pdev) plat_dat->bsp_priv = dwmac; - return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); + ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); + if (ret) + goto err_clk_disable; + + return 0; + +err_clk_disable: + clk_disable_unprepare(dwmac->m25_div_clk); + + return ret; } static int meson8b_dwmac_remove(struct platform_device *pdev)