lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers: phy: Fix memory leak

Browse Source 
'phy' was not being freed upon error in one of the cases.
Adjust the 'goto's to fix this.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sachin Kamat 2013-12-06 17:51:18 +05:30 committed by Greg Kroah-Hartman
parent 1caab68bff
commit c1b1731d20
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/phy/phy-core.c
View File

@ -453,7 +453,7 @@ struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
if (id < 0) {
dev_err(dev, "unable to get id\n");
ret = id;
goto err0;
goto err1;
}
device_initialize(&phy->dev);
@ -468,11 +468,11 @@ struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
ret = dev_set_name(&phy->dev, "phy-%s.%d", dev_name(dev), id);
if (ret)
goto err1;
goto err2;
ret = device_add(&phy->dev);
if (ret)
goto err1;
goto err2;
if (pm_runtime_enabled(dev)) {
pm_runtime_enable(&phy->dev);
@ -481,11 +481,11 @@ struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
return phy;
err1:
err2:
ida_remove(&phy_ida, phy->id);
put_device(&phy->dev);
err1:
kfree(phy);
err0:
return ERR_PTR(ret);
}