]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
net: mvpp2: Fix clk error path in mvpp2_probe
authorMaxime Chevallier <maxime.chevallier@bootlin.com>
Wed, 25 Apr 2018 18:21:16 +0000 (20:21 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 1 Oct 2018 12:57:51 +0000 (14:57 +0200)
commita19619d9975c349616703f0e753ebe2993f9cb29
tree7a544313a0c8d735d8959e0e0387519bd98f9f9d
parentac9b4790b4dd57b15c6ba39fb300d00c22f5b2e7
net: mvpp2: Fix clk error path in mvpp2_probe

BugLink: http://bugs.launchpad.net/bugs/1794889
[ Upstream commit 45f972adb7f4db2d7f02af728ccd104113336074 ]

When clk_prepare_enable fails for the axi_clk, the mg_clk isn't properly
cleaned up. Add another jump label to handle that case, and make sure we
jump to it in the later error cases.

Fixes: 4792ea04bcd0 ("net: mvpp2: Fix clock resource by adding an optional bus clock")
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/ethernet/marvell/mvpp2.c