Commit 5ec0c872 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: stream: use consistent pattern for freeing buffers 

The code should free the message buffer used for data, the message
structure used for control and assign the latter to NULL. The last
part is missing for multi-link cases, and the order is inconsistent
for single-link cases.

Link: https://github.com/thesofproject/linux/issues/4056


Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230119073211.85979-2-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 3bd3bc2a

drivers/soundwire/stream.c

+3 −1
Original line number Diff line number Diff line
@@ -723,8 +723,8 @@ static int sdw_bank_switch(struct sdw_bus *bus, int m_rt_count) 
	}



	if (!multi_link) {

		kfree(wr_msg);

		kfree(wbuf);

		kfree(wr_msg);

		bus->defer_msg.msg = NULL;

		bus->params.curr_bank = !bus->params.curr_bank;

		bus->params.next_bank = !bus->params.next_bank;
@@ -769,6 +769,7 @@ static int sdw_ml_sync_bank_switch(struct sdw_bus *bus) 
	if (bus->defer_msg.msg) {

		kfree(bus->defer_msg.msg->buf);

		kfree(bus->defer_msg.msg);

		bus->defer_msg.msg = NULL;

	}



	return 0;
@@ -867,6 +868,7 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) 
		if (bus->defer_msg.msg) {

			kfree(bus->defer_msg.msg->buf);

			kfree(bus->defer_msg.msg);

			bus->defer_msg.msg = NULL;

		}

	}