]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
coresight tmc etr: Make memory check consistent in the same function
authorMathieu Poirier <mathieu.poirier@linaro.org>
Wed, 9 May 2018 18:06:05 +0000 (12:06 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 May 2018 14:19:59 +0000 (16:19 +0200)
While operating from sysFS the TMC-ETR driver needs to make sure it has
memory to work with but doesn't allocate memory uselessly either.  Since
the main memory handle for this driver is drvdata::vaddr, use it throughout
function tmc_enable_etr_sink_sysfs() so that things are consistent.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hwtracing/coresight/coresight-tmc-etr.c

index cce2ff42e8e2ccd4913834c795b7e3e5b76b797e..8ee8c66f40021bd4769cba6c58483c5089b0ffde 100644 (file)
@@ -153,11 +153,11 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev)
                goto out;
 
        /*
-        * If drvdata::buf == NULL, use the memory allocated above.
+        * If drvdata::vaddr == NULL, use the memory allocated above.
         * Otherwise a buffer still exists from a previous session, so
         * simply use that.
         */
-       if (drvdata->buf == NULL) {
+       if (drvdata->vaddr == NULL) {
                used = true;
                drvdata->vaddr = vaddr;
                drvdata->paddr = paddr;