phy: qcom-ufs: Don't kfree devres resource

BugLink: http://bugs.launchpad.net/bugs/1673118
commit e7d5e412160c2143de1f818668774b33b3cdab0b upstream.

Upon failing to acquire regulator supplies the qcom-ufs driver calls
kfree() on the devm allocated memory used to store the name of the
regulator, leading to devres corruption.

Rather than switching to using the appropriate free function the patch
acknowledge the fact that "name" is always a constant string and we
don't actually need to create a local copy of it, but rather just
reference the constant string.

Fixes: add78fc05702 ("phy: qcom-ufs: Use devm sibling of kstrdup for regulator names")
Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c
index c69568b8543dcfaf4958875288cf9b13432169e5..4d7f3c0182234d9d18f323698500c07b557efc83 100644 (file)
--- a/drivers/phy/phy-qcom-ufs.c
+++ b/drivers/phy/phy-qcom-ufs.c
@@ -217,12 +217,7 @@ static int __ufs_qcom_phy_init_vreg(struct device *dev,
 
        char prop_name[MAX_PROP_NAME];
 
-       vreg->name = devm_kstrdup(dev, name, GFP_KERNEL);
-       if (!vreg->name) {
-               err = -ENOMEM;
-               goto out;
-       }
-
+       vreg->name = name;
        vreg->reg = devm_regulator_get(dev, name);
        if (IS_ERR(vreg->reg)) {
                err = PTR_ERR(vreg->reg);
@@ -265,8 +260,6 @@ static int __ufs_qcom_phy_init_vreg(struct device *dev,
        }
 
 out:
-       if (err)
-               kfree(vreg->name);
        return err;
 }