leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soundwire fixes for 4.19

Browse Source 
- fixes in bus for
 	- bus lock on master release
 	- incorrect exit after stream configuration
 	- duplicate stream state assignment
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJbmOEJAAoJEHwUBw8lI4NHHJ4P/jct8uRTPNT4x0lwVpWoSBF+
 1BSEetaG3sYY3C4XFYnBXvVj352RUwAEmmTxqoWD8zSBW3w2GIkmzw9yC0aIARYt
 LIZPm2YTnqSZJ5GW+jz0pQbEbdsDHGQUsjgfnr2D2yBWOuRxWPMDWFxaNOj/+qaB
 tzHdGClpzCiZVir3fKHjqmCOCFBKozfpP2imDCu9Q2IvbhWOTa3DDgiMAU8jiUfN
 4iV5pjOJ62AIiPYnG6OEuna/V/JCtSbV7RwqsKWbgro0CrPPab8bwEjuzbg+d43n
 6wWPx/fiSlzSWLhxGPtx5Gmc0CYAMmmxVGqN5QdSWyBEcyAMXmWr6OmHtfC4dzRm
 290VNl2NQt0zv7Xu4lsdbPqwjuUHw9CS1HtEx+jehPGfXQO1zkDfY9pgXcjvPbI+
 8yXD6tdjxLDxa3XJJCqsj0tSfbarfxNMEa3CBJ64j3dJxmRVB6XpHeLlqmC8xEyf
 Vg2MkQ2r7RkrfY0GTbf0z6HLZ3JHcm8ceq/wOsOKkgIsnzeGk61sxOi/hdULBMOq
 sIYYz3PMFBqpqOVxl/tEca9NH+htrPRLLbmvw+7G1cYAppXEi5rfI4WaYbycqEhX
 bxNvIN37fFXtd4GTNtb55nNoqd2i0+S1+bdkBOWH/+/pc4VhMETCwTap3B+oUaMg
 qRo+v6CQttAZnJlBthGX
 =Imbd
 -----END PGP SIGNATURE-----

Merge tag 'soundwire-4.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-linus

Vinod writes:

soundwire fixes for 4.19

 - fixes in bus for
	- bus lock on master release
	- incorrect exit after stream configuration
	- duplicate stream state assignment
This commit is contained in:
Greg Kroah-Hartman 2018-09-18 11:11:06 +02:00
commit d193d1a210
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/soundwire/stream.c
View File

@ -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);
}
@ -1112,7 +1113,7 @@ int sdw_stream_add_master(struct sdw_bus *bus,
"Master runtime config failed for stream:%s",
stream->name);
ret = -ENOMEM;
goto error;
goto unlock;
}
ret = sdw_config_stream(bus->dev, stream, stream_config, false);
@ -1123,11 +1124,11 @@ int sdw_stream_add_master(struct sdw_bus *bus,
if (ret)
goto stream_error;
stream->state = SDW_STREAM_CONFIGURED;
goto unlock;
stream_error:
sdw_release_master_stream(stream);
error:
unlock:
mutex_unlock(&bus->bus_lock);
return ret;
}
@ -1141,6 +1142,10 @@ EXPORT_SYMBOL(sdw_stream_add_master);
* @stream: SoundWire stream
* @port_config: Port configuration for audio stream
* @num_ports: Number of ports
*
* It is expected that Slave is added before adding Master
* to the Stream.
*
*/
int sdw_stream_add_slave(struct sdw_slave *slave,
struct sdw_stream_config *stream_config,
@ -1186,6 +1191,12 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
if (ret)
goto stream_error;
/*
* Change stream state to CONFIGURED on first Slave add.
* Bus is not aware of number of Slave(s) in a stream at this
* point so cannot depend on all Slave(s) to be added in order to
* change stream state to CONFIGURED.
*/
stream->state = SDW_STREAM_CONFIGURED;
goto error;