| From ee496da4c3915de3232b5f5cd20e21ae3e46fe8d Mon Sep 17 00:00:00 2001 |
| From: Tingwei Zhang <tingwei@codeaurora.org> |
| Date: Wed, 17 Apr 2019 10:35:34 +0300 |
| Subject: stm class: Fix channel free in stm output free path |
| |
| From: Tingwei Zhang <tingwei@codeaurora.org> |
| |
| 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> |
| |
| --- |
| drivers/hwtracing/stm/core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/hwtracing/stm/core.c |
| +++ b/drivers/hwtracing/stm/core.c |
| @@ -226,8 +226,8 @@ stm_output_disclaim(struct stm_device *s |
| 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; |
| } |
| |
| /* |
