Skip to content

Commit

Permalink
phy: core: Get a refcount to phy in devm_of_phy_get_by_index()
Browse files Browse the repository at this point in the history
On driver detach, devm_phy_release() will put a refcount to
the phy, so gets a refconut to it before return.

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
  • Loading branch information
Chunfeng Yun authored and Kishon Vijay Abraham I committed Dec 7, 2015
1 parent a8c2472 commit 7087446
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions drivers/phy/phy-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -636,8 +636,9 @@ EXPORT_SYMBOL_GPL(devm_of_phy_get);
* @np: node containing the phy
* @index: index of the phy
*
* Gets the phy using _of_phy_get(), and associates a device with it using
* devres. On driver detach, release function is invoked on the devres data,
* Gets the phy using _of_phy_get(), then gets a refcount to it,
* and associates a device with it using devres. On driver detach,
* release function is invoked on the devres data,
* then, devres data is freed.
*
*/
Expand All @@ -651,13 +652,21 @@ struct phy *devm_of_phy_get_by_index(struct device *dev, struct device_node *np,
return ERR_PTR(-ENOMEM);

phy = _of_phy_get(np, index);
if (!IS_ERR(phy)) {
*ptr = phy;
devres_add(dev, ptr);
} else {
if (IS_ERR(phy)) {
devres_free(ptr);
return phy;
}

if (!try_module_get(phy->ops->owner)) {
devres_free(ptr);
return ERR_PTR(-EPROBE_DEFER);
}

get_device(&phy->dev);

*ptr = phy;
devres_add(dev, ptr);

return phy;
}
EXPORT_SYMBOL_GPL(devm_of_phy_get_by_index);
Expand Down

0 comments on commit 7087446

Please sign in to comment.