Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9110fd8b authored by Tingwei Zhang's avatar Tingwei Zhang Committed by Greg Kroah-Hartman
Browse files

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: 7bd1d409 ("stm class: Introduce an abstraction for System Trace Module devices")
Signed-off-by: default avatarTingwei Zhang <tingwei@codeaurora.org>
Signed-off-by: default avatarSai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Cc: stable@vger.kernel.org # v4.4
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd7df892

drivers/hwtracing/stm/core.c

+1 −1
Original line number Diff line number Diff line
@@ -226,8 +226,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;

}



/*