diff options
| author | Tingwei Zhang <tingwei@codeaurora.org> | 2019-04-17 10:35:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-25 18:23:24 +0200 |
| commit | 44bc4e8815a4037ef01b4a860ae5743a58dc3736 (patch) | |
| tree | 22b7b742900fbde6ace889ff4608ddb37f635dbf | |
| parent | 85b94de88046fcb3303ad4f7ed8b2115eef6b9f7 (diff) | |
| download | linux-stable-44bc4e8815a4037ef01b4a860ae5743a58dc3736.tar.gz linux-stable-44bc4e8815a4037ef01b4a860ae5743a58dc3736.tar.bz2 linux-stable-44bc4e8815a4037ef01b4a860ae5743a58dc3736.zip | |
stm class: Fix channel free in stm output free path
commit ee496da4c3915de3232b5f5cd20e21ae3e46fe8d upstream.
Number of free masters is not set correctly in stm
free path. Fix this by properly adding the number
of output channels before setting them to 0 in
stm_output_disclaim().
Currently it is equivalent to doing nothing since
master->nr_free is incremented by 0.
Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Cc: stable@vger.kernel.org # v4.4
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/hwtracing/stm/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index 9d55e104400c..1caca7376e74 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -218,8 +218,8 @@ stm_output_disclaim(struct stm_device *stm, struct stm_output *output) bitmap_release_region(&master->chan_map[0], output->channel, ilog2(output->nr_chans)); - output->nr_chans = 0; master->nr_free += output->nr_chans; + output->nr_chans = 0; } /* |