diff options
author | Suzuki K Poulose <suzuki.poulose@arm.com> | 2016-08-25 15:18:54 -0600 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-03-22 11:51:29 +0800 |
commit | de10b843a6031739406ab603b5bce2a678ffbf40 (patch) | |
tree | ae2df4825c6cb0950267430b29683cca61f77aaa | |
parent | d3539486bbce11701e012428ce7690000dd34fa6 (diff) |
coresight: Remove erroneous dma_free_coherent in tmc_probev4.4/topic/coresight
commit de5461970b3e9e194 ("coresight: tmc: allocating memory when needed")
removed the static allocation of buffer for the trace data in ETR mode in
tmc_probe. However it failed to remove the "devm_free_coherent" in
tmc_probe when the probe fails due to other reasons. This patch gets
rid of the incorrect dma_free_coherent() call.
Fixes: commit de5461970b3e9e194 ("coresight: tmc: allocating memory when needed")
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 481e46fe7a88557b66330cbb047b25cc13eff4b9)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
-rw-r--r-- | drivers/hwtracing/coresight/coresight-tmc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index 9e02ac963cd0..3978cbb6b038 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -388,9 +388,6 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) err_misc_register: coresight_unregister(drvdata->csdev); err_devm_kzalloc: - if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) - dma_free_coherent(dev, drvdata->size, - drvdata->vaddr, drvdata->paddr); return ret; } |