All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johan Hovold <johan@kernel.org>
To: "David S. Miller" <davem@davemloft.net>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>,
	Alexandre Torgue <alexandre.torgue@st.com>,
	Joachim Eastwood <manabian@gmail.com>,
	Carlo Caione <carlo@caione.org>,
	Kevin Hilman <khilman@baylibre.com>,
	Maxime Coquelin <mcoquelin.stm32@gmail.com>,
	Maxime Ripard <maxime.ripard@free-electrons.com>,
	Chen-Yu Tsai <wens@csie.org>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johan Hovold <johan@kernel.org>
Subject: [PATCH net 3/7] net: ethernet: stmmac: dwmac-rk: fix probe error path
Date: Wed, 30 Nov 2016 15:29:51 +0100	[thread overview]
Message-ID: <1480516195-27696-4-git-send-email-johan@kernel.org> (raw)
In-Reply-To: <1480516195-27696-1-git-send-email-johan@kernel.org>

Make sure to disable runtime PM, power down the PHY, and disable clocks
before returning on late probe errors.

Fixes: 27ffefd2d109 ("stmmac: dwmac-rk: create a new probe function")
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 3740a4417fa0..e7aabe56c15a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -988,7 +988,16 @@ static int rk_gmac_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+	if (ret)
+		goto err_gmac_exit;
+
+	return 0;
+
+err_gmac_exit:
+	rk_gmac_exit(pdev, plat_dat->bsp_priv);
+
+	return ret;
 }
 
 static const struct of_device_id rk_gmac_dwmac_match[] = {
-- 
2.7.3

  parent reply	other threads:[~2016-11-30 14:34 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-30 14:29 [PATCH net 0/7] net: stmmac: fix probe error handling and phydev leaks Johan Hovold
2016-11-30 14:29 ` [PATCH net 1/7] net: ethernet: stmmac: dwmac-socfpga: fix use-after-free on probe errors Johan Hovold
2016-11-30 14:29 ` [PATCH net 2/7] net: ethernet: stmmac: dwmac-sti: fix probe error path Johan Hovold
2016-11-30 14:29 ` Johan Hovold [this message]
2016-11-30 14:29 ` [PATCH net 4/7] net: ethernet: stmmac: dwmac-generic: " Johan Hovold
2016-11-30 14:29 ` [PATCH net 5/7] net: ethernet: stmmac: dwmac-meson8b: " Johan Hovold
2016-11-30 16:43   ` Kevin Hilman
2016-11-30 14:29 ` [PATCH net 6/7] net: ethernet: stmmac: platform: fix outdated function header Johan Hovold
2016-11-30 14:29 ` [PATCH net 7/7] net: ethernet: stmmac: fix of-node and fixed-link-phydev leaks Johan Hovold
2016-11-30 14:39   ` Maxime Ripard
2016-12-02  8:46 ` [PATCH net 0/7] net: stmmac: fix probe error handling and phydev leaks Giuseppe CAVALLARO
2016-12-02 15:43 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1480516195-27696-4-git-send-email-johan@kernel.org \
    --to=johan@kernel.org \
    --cc=alexandre.torgue@st.com \
    --cc=carlo@caione.org \
    --cc=davem@davemloft.net \
    --cc=khilman@baylibre.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=manabian@gmail.com \
    --cc=maxime.ripard@free-electrons.com \
    --cc=mcoquelin.stm32@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=peppe.cavallaro@st.com \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.