summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-12-06 12:21:18 (GMT)
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-05-15 05:29:16 (GMT)
commit62fa5041f74759a5d12cb90230aa44fd8699546a (patch)
tree4ec1c923830f503eb6106da642bf1d5a0072e772
parent03bcb67f99064424c2286f331bc73fc6a326dc21 (diff)
downloadlinux-3.10-62fa5041f74759a5d12cb90230aa44fd8699546a.zip
linux-3.10-62fa5041f74759a5d12cb90230aa44fd8699546a.tar.gz
linux-3.10-62fa5041f74759a5d12cb90230aa44fd8699546a.tar.bz2
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> [backport from upstream commit c1b1731d2002b93857810aa5da856b43f46bb470] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-Id: I170f5d157e97077e50f059dbecdcb0877fd1a680
-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 03cf8fb..712b358 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);
}