Commit 535f366f authored Jul 17, 2020 by Wang Hai Committed by Greg Kroah-Hartman Jul 29, 2020

net: ethernet: ave: Fix error returns in ave_init



[ Upstream commit 1264d7fa3a64d8bea7aebb77253f917947ffda25 ]

When regmap_update_bits failed in ave_init(), calls of the functions
reset_control_assert() and clk_disable_unprepare() were missed.
Add goto out_reset_assert to do this.

Fixes: 57878f2f ("net: ethernet: ave: add support for phy-mode setting of system controller")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Reviewed-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 8a330ede

drivers/net/ethernet/socionext/sni_ave.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1196,7 +1196,7 @@ static int ave_init(struct net_device *ndev)
		ret = regmap_update_bits(priv->regmap, SG_ETPINMODE,
		priv->pinmode_mask, priv->pinmode_val);
		if (ret)
		return ret;
		goto out_reset_assert;

		ave_global_reset(ndev);