mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
soundwire: Fix acquiring bus lock twice during master release
As part of sdw_stream_remove_master(), sdw_stream_remove_slave() is called which results in bus lock being acquired twice. So, fix it by performing specific Slave remove operations in sdw_release_master_stream() instead of calling sdw_stream_remove_slave(). Signed-off-by: Sanyog Kale <[email protected]> Signed-off-by: Shreyas NC <[email protected]> Acked-by: Pierre-Louis Bossart <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
This commit is contained in:
1 parent
3fef1a2259
commit
8d6ccf5ceb
1 file changed
+4
-3
@@ -899,9 +899,10 @@ static void sdw_release_master_stream(struct sdw_stream_runtime *stream)
|
||||
struct sdw_master_runtime *m_rt = stream->m_rt;
|
||||
struct sdw_slave_runtime *s_rt, *_s_rt;
|
||||
|
||||
list_for_each_entry_safe(s_rt, _s_rt,
|
||||
&m_rt->slave_rt_list, m_rt_node)
|
||||
sdw_stream_remove_slave(s_rt->slave, stream);
|
||||
list_for_each_entry_safe(s_rt, _s_rt, &m_rt->slave_rt_list, m_rt_node) {
|
||||
sdw_slave_port_release(s_rt->slave->bus, s_rt->slave, stream);
|
||||
sdw_release_slave_stream(s_rt->slave, stream);
|
||||
}
|
||||
|
||||
list_del(&m_rt->bus_node);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user