coresight: hwtracing: fix dangling pointer issues

Fix the dangling pointer issues on CoreSight that can cause the kernel
panic.

Change-Id: Ic20405cf2f64c6bc38e994780577b7da42cf6aba
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>

diff --git a/drivers/hwtracing/coresight/coresight-csr.c b/drivers/hwtracing/coresight/coresight-csr.c
index dfb2922..3c18d68 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-csr.c
+++ b/drivers/hwtracing/coresight/coresight-csr.c
@@ -191,8 +191,6 @@ static int csr_probe(struct platform_device *pdev)
        drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
        if (!drvdata)
                return -ENOMEM;
-       /* Store the driver data pointer for use in exported functions */
-       csrdrvdata = drvdata;
        drvdata->dev = &pdev->dev;
        platform_set_drvdata(pdev, drvdata);
 
@@ -220,6 +218,8 @@ static int csr_probe(struct platform_device *pdev)
        if (IS_ERR(drvdata->csdev))
                return PTR_ERR(drvdata->csdev);
 
+       /* Store the driver data pointer for use in exported functions */
+       csrdrvdata = drvdata;
        dev_info(dev, "CSR initialized\n");
        return 0;
 }

diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c
index a234d61..fb2f272 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-stm.c
+++ b/drivers/hwtracing/coresight/coresight-stm.c
@@ -774,8 +774,6 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
        drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
        if (!drvdata)
                return -ENOMEM;
-       /* Store the driver data pointer for use in exported functions */
-       stmdrvdata = drvdata;
        drvdata->dev = &adev->dev;
        dev_set_drvdata(dev, drvdata);
 
@@ -846,6 +844,8 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
        if (boot_enable)
                coresight_enable(drvdata->csdev);
 
+       /* Store the driver data pointer for use in exported functions */
+       stmdrvdata = drvdata;
        return 0;
 err:
        coresight_unregister(drvdata->csdev);

diff --git a/drivers/soc/qcom/jtag-fuse.c b/drivers/soc/qcom/jtag-fuse.c
index 0b05ce9..0f34772 100644 (file)
--- a/drivers/soc/qcom/jtag-fuse.c
+++ b/drivers/soc/qcom/jtag-fuse.c
@@ -152,8 +152,6 @@ static int jtag_fuse_probe(struct platform_device *pdev)
        drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
        if (!drvdata)
                return -ENOMEM;
-       /* Store the driver data pointer for use in exported functions */
-       fusedrvdata = drvdata;
        drvdata->dev = &pdev->dev;
        platform_set_drvdata(pdev, drvdata);
 
@@ -174,6 +172,8 @@ static int jtag_fuse_probe(struct platform_device *pdev)
        if (!drvdata->base)
                return -ENOMEM;
 
+       /* Store the driver data pointer for use in exported functions */
+       fusedrvdata = drvdata;
        dev_info(dev, "JTag Fuse initialized\n");
        return 0;
 }