commit 9c08fa8c99ec6a82ac66ad725f65c045e1bdc2c7
author qctecmdr Service <qctecmdr@qualcomm.com> Tue Oct 23 21:45:01 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 23 21:45:00 2018 -0700
tree bef6716a4f18981e666c38cdb97eff20aff8755d
parent 4dc951774c4b584634440a933b38c4b5d5a0d730
parent 92dd0e7058ffb4fe880b67fad494387f07ebdaa3

Merge "coresight: place pm_runtime_put() properly"

drivers/hwtracing/coresight/coresight-etb10.c

diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c
index 306119e..c424e52 100644
--- a/drivers/hwtracing/coresight/coresight-etb10.c
+++ b/drivers/hwtracing/coresight/coresight-etb10.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2012,2018 The Linux Foundation. All rights reserved.
  *
  * Description: CoreSight Embedded Trace Buffer driver
  */
@@ -674,7 +674,6 @@
 	spin_lock_init(&drvdata->spinlock);
 
 	drvdata->buffer_depth = etb_get_buffer_depth(drvdata);
-	pm_runtime_put(&adev->dev);
 
 	if (drvdata->buffer_depth & 0x80000000)
 		return -EINVAL;
@@ -700,6 +699,7 @@
 	ret = misc_register(&drvdata->miscdev);
 	if (ret)
 		goto err_misc_register;
+	pm_runtime_put(&adev->dev);
 
 	return 0;
 

drivers/hwtracing/coresight/coresight-tmc.c

diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c
index 26250d6..2635289 100644
--- a/drivers/hwtracing/coresight/coresight-tmc.c
+++ b/drivers/hwtracing/coresight/coresight-tmc.c
@@ -667,8 +667,6 @@
 		drvdata->size = readl_relaxed(drvdata->base + TMC_RSZ) * 4;
 	}
 
-	pm_runtime_put(&adev->dev);
-
 	ret = of_get_coresight_csr_name(adev->dev.of_node, &drvdata->csr_name);
 	if (ret)
 		dev_err(dev, "No csr data\n");
@@ -727,6 +725,10 @@
 		coresight_unregister(drvdata->csdev);
 		goto out_iommu_deinit;
 	}
+
+	if (!ret)
+		pm_runtime_put(&adev->dev);
+
 	return ret;
 
 out_iommu_deinit: