Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1420324

Re: [PATCH v2 3/9] coresight: Remove erroneous dma_free_coherent in tmc_probe

Show all headers | View raw

On 6 June 2016 at 03:11, Suzuki K Poulose <suzuki.poulose@arm.com> wrote:
> 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. Also consolidates the
> error return paths.

Since this set has to go for one more round, please remove the last
line in the commit message.  The error path is consolidated in patch
8/9.

>
> 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>
> ---
>  drivers/hwtracing/coresight/coresight-tmc.c | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c
> index 9e02ac9..3978cbb 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;
>  }
>
> --
> 1.9.1
>

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] coresight: Miscellaneous fixes Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-06-06 11:20 +0200
  [PATCH v2 1/9] coresight: Fix NULL pointer dereference in _coresight_build_path Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-06-06 11:20 +0200
  [PATCH v2 6/9] coresight: etmv4: Fix ETMv4x peripheral ID table Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-06-06 11:20 +0200
  [PATCH v2 5/9] coresight: tmc: Limit the trace to available data Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-06-06 11:20 +0200
  [PATCH v2 3/9] coresight: Remove erroneous dma_free_coherent in tmc_probe Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-06-06 11:20 +0200
    Re: [PATCH v2 3/9] coresight: Remove erroneous dma_free_coherent in tmc_probe Mathieu Poirier <mathieu.poirier@linaro.org> - 2016-06-12 22:40 +0200
  [PATCH v2 8/9] coresight: Consolidate error handling path for tmc_probe Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-06-06 11:20 +0200
  [PATCH v2 7/9] coresight: Cleanup TMC status check Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-06-06 11:20 +0200
  [PATCH v2 4/9] coresight: Fix csdev connections initialisation Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-06-06 11:20 +0200
    Re: [PATCH v2 4/9] coresight: Fix csdev connections initialisation Mathieu Poirier <mathieu.poirier@linaro.org> - 2016-06-12 22:40 +0200
      Re: [PATCH v2 4/9] coresight: Fix csdev connections initialisation Suzuki K Poulose <Suzuki.Poulose@arm.com> - 2016-06-13 11:00 +0200
        Re: [PATCH v2 4/9] coresight: Fix csdev connections initialisation Mathieu Poirier <mathieu.poirier@linaro.org> - 2016-06-13 16:40 +0200
  [PATCH v2 2/9] coresight: Fix tmc_read_unprepare_etr Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-06-06 11:20 +0200
  [PATCH] coresight: Fix erroneous memset in tmc_read_unprepare_etr Suzuki K Poulose <suzuki.poulose@arm.com> - 2016-06-10 12:40 +0200
    Re: [PATCH] coresight: Fix erroneous memset in tmc_read_unprepare_etr Mathieu Poirier <mathieu.poirier@linaro.org> - 2016-06-12 23:10 +0200
      Re: [PATCH] coresight: Fix erroneous memset in tmc_read_unprepare_etr Suzuki K Poulose <Suzuki.Poulose@arm.com> - 2016-06-13 11:10 +0200

csiph-web