]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
phy: core: Fix that API devm_phy_destroy() fails to destroy the phy
authorZijun Hu <quic_zijuhu@quicinc.com>
Fri, 13 Dec 2024 12:36:43 +0000 (20:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Jan 2025 09:30:49 +0000 (10:30 +0100)
commit 4dc48c88fcf82b89fdebd83a906aaa64f40fb8a9 upstream.

For devm_phy_destroy(), its comment says it needs to invoke phy_destroy()
to destroy the phy, but it will not actually invoke the function since
devres_destroy() does not call devm_phy_consume(), and the missing
phy_destroy() call will cause that the phy fails to be destroyed.

Fortunately, the faulty API has not been used by current kernel tree.
Fix by using devres_release() instead of devres_destroy() within the API.

Fixes: ff764963479a ("drivers: phy: add generic PHY framework")
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20241213-phy_core_fix-v6-3-40ae28f5015a@quicinc.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/phy/phy-core.c

index 9d47415499fc1a368f391947352433f6722ecd38..0730fe80dc3c11fb6d82339142ae2758fa9b859b 100644 (file)
@@ -1061,7 +1061,7 @@ void devm_phy_destroy(struct device *dev, struct phy *phy)
 {
        int r;
 
-       r = devres_destroy(dev, devm_phy_consume, devm_phy_match, phy);
+       r = devres_release(dev, devm_phy_consume, devm_phy_match, phy);
        dev_WARN_ONCE(dev, r, "couldn't find PHY resource\n");
 }
 EXPORT_SYMBOL_GPL(devm_phy_destroy);