Commit 823ca885 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: stream: add slave runtime to list earlier 



sdw_config_stream() only verifies the compatibility between
information provided by the Slave driver and the stream configuration.

There is no problem if we add the slave runtime to the list earlier.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220126011715.28204-3-yung-chuan.liao@linux.intel.com


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

drivers/soundwire/stream.c

+2 −11
Original line number Diff line number Diff line
@@ -1373,20 +1373,11 @@ int sdw_stream_add_slave(struct sdw_slave *slave, 
		ret = -ENOMEM;

		goto stream_error;

	}

	list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list);



	ret = sdw_config_stream(&slave->dev, stream, stream_config, true);

	if (ret) {

		/*

		 * sdw_release_master_stream will release s_rt in slave_rt_list in

		 * stream_error case, but s_rt is only added to slave_rt_list

		 * when sdw_config_stream is successful, so free s_rt explicitly

		 * when sdw_config_stream is failed.

		 */

		kfree(s_rt);

	if (ret)

		goto stream_error;

	}



	list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list);



	ret = sdw_slave_port_config(slave, s_rt, port_config, num_ports);

	if (ret)