summaryrefslogtreecommitdiffstats
path: root/drivers/phy
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-12-06 17:51:18 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-10 12:53:30 -0800
commitc1b1731d2002b93857810aa5da856b43f46bb470 (patch)
treef98d07c8ce2ff272267e691e55f7078a49e19f42 /drivers/phy
parent1caab68bff266fb4cea0bee7a8a5494042e883a9 (diff)
downloadlinux-stable-c1b1731d2002b93857810aa5da856b43f46bb470.tar.gz
linux-stable-c1b1731d2002b93857810aa5da856b43f46bb470.tar.bz2
linux-stable-c1b1731d2002b93857810aa5da856b43f46bb470.zip
drivers: phy: Fix memory leak
'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>
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/phy-core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 03cf8fb81554..712b358a5756 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -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);
}