From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.4 07/15] net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe()
Date: Wed, 13 Mar 2019 15:17:53 -0400 [thread overview]
Message-ID: <20190313191806.160547-7-sashal@kernel.org> (raw)
In-Reply-To: <20190313191806.160547-1-sashal@kernel.org>
From: Alexey Khoroshilov <khoroshilov@ispras.ru>
[ Upstream commit e928b5d6b75e239feb9c6d5488974b6646a0ebc8 ]
If mv643xx_eth_shared_of_probe() fails, mv643xx_eth_shared_probe()
leaves clk enabled.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/marvell/mv643xx_eth.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 4182290fdbcf..82f080a5ed5c 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2884,7 +2884,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
ret = mv643xx_eth_shared_of_probe(pdev);
if (ret)
- return ret;
+ goto err_put_clk;
pd = dev_get_platdata(&pdev->dev);
msp->tx_csum_limit = (pd != NULL && pd->tx_csum_limit) ?
@@ -2892,6 +2892,11 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
infer_hw_params(msp);
return 0;
+
+err_put_clk:
+ if (!IS_ERR(msp->clk))
+ clk_disable_unprepare(msp->clk);
+ return ret;
}
static int mv643xx_eth_shared_remove(struct platform_device *pdev)
--
2.19.1
next prev parent reply other threads:[~2019-03-13 19:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-13 19:17 [PATCH AUTOSEL 4.4 01/15] ARM: 8824/1: fix a migrating irq bug when hotplug cpu Sasha Levin
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 02/15] assoc_array: Fix shortcut creation Sasha Levin
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 03/15] scsi: libiscsi: Fix race between iscsi_xmit_task and iscsi_complete_task Sasha Levin
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 04/15] scsi: libsas: Fix rphy phy_identifier for PHYs with end devices attached Sasha Levin
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 05/15] net: systemport: Fix reception of BPDUs Sasha Levin
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 06/15] pinctrl: meson: meson8b: fix the sdxc_a data 1..3 pins Sasha Levin
2019-03-13 19:17 ` Sasha Levin [this message]
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 08/15] ASoC: topology: free created components in tplg load error Sasha Levin
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 09/15] arm64: Relax GIC version check during early boot Sasha Levin
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 10/15] tmpfs: fix link accounting when a tmpfile is linked in Sasha Levin
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 11/15] ARC: uacces: remove lp_start, lp_end from clobber list Sasha Levin
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 12/15] phonet: fix building with clang Sasha Levin
2019-03-13 19:17 ` [PATCH AUTOSEL 4.4 13/15] mac80211_hwsim: propagate genlmsg_reply return code Sasha Levin
2019-03-13 19:18 ` [PATCH AUTOSEL 4.4 14/15] mdio_bus: Fix use-after-free on device_register fails Sasha Levin
2019-03-13 19:18 ` [PATCH AUTOSEL 4.4 15/15] net: set static variable an initial value in atl2_probe() Sasha Levin
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=20190313191806.160547-7-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=khoroshilov@ispras.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.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 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).