Merge tag 'soundwire-5.9-fixes' of... (51fc07d9) · Commits · 戴 / test

Merge tag 'soundwire-5.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-linus Vinod writes: soundwire fixes for v5.8 This contains two fixes to sdw core for dangling pointer and a typo for INTSTAT register * tag 'soundwire-5.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire: soundwire: fix double free of dangling pointer soundwire: bus: fix typo in comment on INTSTAT registers

drivers/soundwire/bus.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1372,7 +1372,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
		return ret;
		}

		/* Read Instat 1, Instat 2 and Instat 3 registers */
		/* Read Intstat 1, Intstat 2 and Intstat 3 registers */
		ret = sdw_read(slave, SDW_SCP_INT1);
		if (ret < 0) {
		dev_err(slave->bus->dev,

+5 −3

Original line number	Diff line number	Diff line
		@@ -717,6 +717,7 @@ error:
		kfree(wbuf);
		error_1:
		kfree(wr_msg);
		bus->defer_msg.msg = NULL;
		return ret;
		}

		@@ -840,10 +841,11 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)
		error:
		list_for_each_entry(m_rt, &stream->master_list, stream_node) {
		bus = m_rt->bus;

		if (bus->defer_msg.msg) {
		kfree(bus->defer_msg.msg->buf);
		kfree(bus->defer_msg.msg);
		}
		}

		msg_unlock: