* [PATCH 1/3] net: davicom: Fix regulator not turned off on failed probe
@ 2021-03-07 13:17 Paul Cercueil
2021-03-07 13:17 ` [PATCH 2/3] net: davicom: Fix regulator not turned off on driver removal Paul Cercueil
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Paul Cercueil @ 2021-03-07 13:17 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski; +Cc: od, netdev, linux-kernel, Paul Cercueil
When the probe fails or requests to be defered, we must disable the
regulator that was previously enabled.
Fixes: 7994fe55a4a2 ("dm9000: Add regulator and reset support to dm9000")
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/net/ethernet/davicom/dm9000.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index 3fdc70dab5c1..ae744826bb9e 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -1449,7 +1449,7 @@ dm9000_probe(struct platform_device *pdev)
if (ret) {
dev_err(dev, "failed to request reset gpio %d: %d\n",
reset_gpios, ret);
- return -ENODEV;
+ goto out_regulator_disable;
}
/* According to manual PWRST# Low Period Min 1ms */
@@ -1461,8 +1461,10 @@ dm9000_probe(struct platform_device *pdev)
if (!pdata) {
pdata = dm9000_parse_dt(&pdev->dev);
- if (IS_ERR(pdata))
- return PTR_ERR(pdata);
+ if (IS_ERR(pdata)) {
+ ret = PTR_ERR(pdata);
+ goto out_regulator_disable;
+ }
}
/* Init network device */
@@ -1703,6 +1705,10 @@ dm9000_probe(struct platform_device *pdev)
dm9000_release_board(pdev, db);
free_netdev(ndev);
+out_regulator_disable:
+ if (!IS_ERR(power))
+ regulator_disable(power);
+
return ret;
}
--
2.30.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] net: davicom: Fix regulator not turned off on driver removal
2021-03-07 13:17 [PATCH 1/3] net: davicom: Fix regulator not turned off on failed probe Paul Cercueil
@ 2021-03-07 13:17 ` Paul Cercueil
2021-03-07 13:17 ` [PATCH 3/3] net: davicom: Use platform_get_irq_optional() Paul Cercueil
2021-03-08 20:10 ` [PATCH 1/3] net: davicom: Fix regulator not turned off on failed probe patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Paul Cercueil @ 2021-03-07 13:17 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski; +Cc: od, netdev, linux-kernel, Paul Cercueil
We must disable the regulator that was enabled in the probe function.
Fixes: 7994fe55a4a2 ("dm9000: Add regulator and reset support to dm9000")
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/net/ethernet/davicom/dm9000.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index ae744826bb9e..a95e95ce9438 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -133,6 +133,8 @@ struct board_info {
u32 wake_state;
int ip_summed;
+
+ struct regulator *power_supply;
};
/* debug code */
@@ -1481,6 +1483,8 @@ dm9000_probe(struct platform_device *pdev)
db->dev = &pdev->dev;
db->ndev = ndev;
+ if (!IS_ERR(power))
+ db->power_supply = power;
spin_lock_init(&db->lock);
mutex_init(&db->addr_lock);
@@ -1766,10 +1770,13 @@ static int
dm9000_drv_remove(struct platform_device *pdev)
{
struct net_device *ndev = platform_get_drvdata(pdev);
+ struct board_info *dm = to_dm9000_board(ndev);
unregister_netdev(ndev);
- dm9000_release_board(pdev, netdev_priv(ndev));
+ dm9000_release_board(pdev, dm);
free_netdev(ndev); /* free device structure */
+ if (dm->power_supply)
+ regulator_disable(dm->power_supply);
dev_dbg(&pdev->dev, "released and freed device\n");
return 0;
--
2.30.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] net: davicom: Use platform_get_irq_optional()
2021-03-07 13:17 [PATCH 1/3] net: davicom: Fix regulator not turned off on failed probe Paul Cercueil
2021-03-07 13:17 ` [PATCH 2/3] net: davicom: Fix regulator not turned off on driver removal Paul Cercueil
@ 2021-03-07 13:17 ` Paul Cercueil
2021-03-08 20:10 ` [PATCH 1/3] net: davicom: Fix regulator not turned off on failed probe patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Paul Cercueil @ 2021-03-07 13:17 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski; +Cc: od, netdev, linux-kernel, Paul Cercueil
The second IRQ line really is optional, so use
platform_get_irq_optional() to obtain it.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/net/ethernet/davicom/dm9000.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index a95e95ce9438..252adfa5d837 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -1507,7 +1507,7 @@ dm9000_probe(struct platform_device *pdev)
goto out;
}
- db->irq_wake = platform_get_irq(pdev, 1);
+ db->irq_wake = platform_get_irq_optional(pdev, 1);
if (db->irq_wake >= 0) {
dev_dbg(db->dev, "wakeup irq %d\n", db->irq_wake);
--
2.30.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] net: davicom: Fix regulator not turned off on failed probe
2021-03-07 13:17 [PATCH 1/3] net: davicom: Fix regulator not turned off on failed probe Paul Cercueil
2021-03-07 13:17 ` [PATCH 2/3] net: davicom: Fix regulator not turned off on driver removal Paul Cercueil
2021-03-07 13:17 ` [PATCH 3/3] net: davicom: Use platform_get_irq_optional() Paul Cercueil
@ 2021-03-08 20:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-03-08 20:10 UTC (permalink / raw)
To: Paul Cercueil; +Cc: davem, kuba, od, netdev, linux-kernel
Hello:
This series was applied to netdev/net.git (refs/heads/master):
On Sun, 7 Mar 2021 13:17:47 +0000 you wrote:
> When the probe fails or requests to be defered, we must disable the
> regulator that was previously enabled.
>
> Fixes: 7994fe55a4a2 ("dm9000: Add regulator and reset support to dm9000")
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
> drivers/net/ethernet/davicom/dm9000.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
Here is the summary with links:
- [1/3] net: davicom: Fix regulator not turned off on failed probe
https://git.kernel.org/netdev/net/c/ac88c531a5b3
- [2/3] net: davicom: Fix regulator not turned off on driver removal
https://git.kernel.org/netdev/net/c/cf9e60aa69ae
- [3/3] net: davicom: Use platform_get_irq_optional()
https://git.kernel.org/netdev/net/c/2e2696223676
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-08 20:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-07 13:17 [PATCH 1/3] net: davicom: Fix regulator not turned off on failed probe Paul Cercueil
2021-03-07 13:17 ` [PATCH 2/3] net: davicom: Fix regulator not turned off on driver removal Paul Cercueil
2021-03-07 13:17 ` [PATCH 3/3] net: davicom: Use platform_get_irq_optional() Paul Cercueil
2021-03-08 20:10 ` [PATCH 1/3] net: davicom: Fix regulator not turned off on failed probe patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).