From: Sean@vger.kernel.org, Wang@vger.kernel.org
To: john@phrozen.org, davem@davemloft.net
Cc: nbd@openwrt.org, netdev@vger.kernel.org,
linux-mediatek@lists.infradead.org, keyhaede@gmail.com,
Sean Wang <sean.wang@mediatek.com>
Subject: [PATCH net 02/10] net: ethernet: mediatek: fix incorrect return value of devm_clk_get with EPROBE_DEFER
Date: Thu, 25 Aug 2016 18:22:29 +0800 [thread overview]
Message-ID: <1472120557-15216-3-git-send-email-sean.wang@mediatek.com> (raw)
In-Reply-To: <1472120557-15216-1-git-send-email-sean.wang@mediatek.com>
From: Sean Wang <sean.wang@mediatek.com>
If the return value of devm_clk_get is EPROBE_DEFER, we should
defer probing the driver. The change is verified and works based
on 4.8-rc1 staying with the latest clk-next code for MT7623.
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 6e4a6ca..02b048f 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1851,8 +1851,15 @@ static int mtk_probe(struct platform_device *pdev)
eth->clk_gp1 = devm_clk_get(&pdev->dev, "gp1");
eth->clk_gp2 = devm_clk_get(&pdev->dev, "gp2");
if (IS_ERR(eth->clk_esw) || IS_ERR(eth->clk_gp1) ||
- IS_ERR(eth->clk_gp2) || IS_ERR(eth->clk_ethif))
- return -ENODEV;
+ IS_ERR(eth->clk_gp2) || IS_ERR(eth->clk_ethif)) {
+ if (PTR_ERR(eth->clk_esw) == -EPROBE_DEFER ||
+ PTR_ERR(eth->clk_gp1) == -EPROBE_DEFER ||
+ PTR_ERR(eth->clk_gp1) == -EPROBE_DEFER ||
+ PTR_ERR(eth->clk_gp2) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ else
+ return -ENODEV;
+ }
clk_prepare_enable(eth->clk_ethif);
clk_prepare_enable(eth->clk_esw);
--
1.9.1
next prev parent reply other threads:[~2016-08-25 10:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-25 10:22 [PATCH net 00/10] net: ethernet: mediatek: a couple of fixes Sean, Wang
2016-08-25 10:22 ` [PATCH net 01/10] net: ethernet: mediatek: fix fails from TX housekeeping due to incorrect port setup Sean, Wang
2016-08-25 10:22 ` Sean, Wang [this message]
2016-08-25 10:22 ` [PATCH net 03/10] net: ethernet: mediatek: fix API usage with skb_free_frag Sean, Wang
2016-08-25 10:22 ` [PATCH net 04/10] net: ethernet: mediatek: remove redundant free_irq for devm_request_irq allocated irq Sean, Wang
2016-08-25 10:22 ` [PATCH net 05/10] net: ethernet: mediatek: fix logic unbalance between probe and remove Sean, Wang
2016-08-25 10:22 ` [PATCH net 06/10] net: ethernet: mediatek: fix the loss of pin-mux setting for GMAC2 Sean, Wang
2016-08-25 10:22 ` [PATCH net 07/10] net: ethernet: mediatek: fix issue of driver removal with interface is up Sean, Wang
2016-08-25 10:22 ` [PATCH net 08/10] net: ethernet: mediatek: fix the missing of_node_put() after node is used done inside mtk_mdio_init Sean, Wang
2016-08-25 10:22 ` [PATCH net 09/10] net: ethernet: mediatek: use devm_mdiobus_alloc instead of mdiobus_alloc " Sean, Wang
2016-08-25 10:22 ` [PATCH net 10/10] net: ethernet: mediatek: fix error handling " Sean, Wang
[not found] ` <1472120557-15216-1-git-send-email-sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2016-08-25 16:13 ` [PATCH net 00/10] net: ethernet: mediatek: a couple of fixes 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=1472120557-15216-3-git-send-email-sean.wang@mediatek.com \
--to=sean@vger.kernel.org \
--cc=Wang@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=john@phrozen.org \
--cc=keyhaede@gmail.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=nbd@openwrt.org \
--cc=netdev@vger.kernel.org \
--cc=sean.wang@mediatek.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox