net: stmmac: dwmac-meson8b: fix meson8b_devm_clk_prepare_enable()
There are two problems with meson8b_devm_clk_prepare_enable(), introduced in commita54dc4a490
("net: stmmac: dwmac-meson8b: Make the clock enabling code re-usable"): - It doesn't pass the clk argument, but instead always the rgmii_tx_clk of the device. - It silently ignores the return value of devm_add_action_or_reset(). The former didn't become an actual bug until another user showed up in the next commit9308c47640
("net: stmmac: dwmac-meson8b: add support for the RX delay configuration"). The latter means the callers could end up with the clock not actually prepared/enabled. Fixes:a54dc4a490
("net: stmmac: dwmac-meson8b: Make the clock enabling code re-usable") Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Link: https://lore.kernel.org/r/20221104083004.2212520-1-linux@rasmusvillemoes.dk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
c23fb2c822
commit
ed4314f772
|
@ -272,11 +272,9 @@ static int meson8b_devm_clk_prepare_enable(struct meson8b_dwmac *dwmac,
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
devm_add_action_or_reset(dwmac->dev,
|
||||
(void(*)(void *))clk_disable_unprepare,
|
||||
dwmac->rgmii_tx_clk);
|
||||
|
||||
return 0;
|
||||
return devm_add_action_or_reset(dwmac->dev,
|
||||
(void(*)(void *))clk_disable_unprepare,
|
||||
clk);
|
||||
}
|
||||
|
||||
static int meson8b_init_rgmii_delays(struct meson8b_dwmac *dwmac)
|
||||
|
|
Loading…
Reference in New Issue