soundwire: stream: Add missing clear of alloc_slave_rt
PATCH v2 1/5 soundwire: stream: Add missing clear of alloc_slave_rt
The current path that skips allocating the slave runtime does not clear the alloc_slave_rt flag, this is clearly incorrect. Add the missing clear, so the runtime won't be erroneously cleaned up.
---
Changes since v1:
- Added missing fixes tag
Thanks,
Charles
drivers/soundwire/stream.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/soundwire/stream.c +3 -1
@@ -2021,8 +2021,10 @@ int sdw_stream_add_slave(struct sdw_slave *slave, skip_alloc_master_rt: s_rt =sdw_slave_rt_find (slave, stream); -if (s_rt) +if (s_rt) { + alloc_slave_rt = false; goto skip_alloc_slave_rt; + } s_rt =sdw_slave_rt_alloc (slave, m_rt);if (!s_rt) {
Signature · 1 line
2.30.2
PATCH v2 2/5 soundwire: bandwidth allocation: Remove pointless variable
The block_offset variable in _sdw_compute_port_params adds nothing either functionally or in terms of code clarity, remove it.
---
No changes since v1.
Thanks,
Charles
drivers/soundwire/generic_bandwidth_allocation.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/soundwire/generic_bandwidth_allocation.c +3 -7
@@ -139,20 +139,16 @@ static void _sdw_compute_port_params(struct sdw_bus *bus, {struct sdw_master_runtime *m_rt;int hstop = bus->params.col -1 ; -int block_offset, port_bo, i; +int port_bo, i;/* Run loop for all groups to compute transport parameters */ for (i =0 ; i < count; i++) { port_bo =1 ; - block_offset =1 ;list_for_each_entry (m_rt, &bus->m_rt_list, bus_node) { -sdw_compute_master_ports (m_rt, ¶ms[i], - port_bo, hstop); +sdw_compute_master_ports (m_rt, ¶ms[i], port_bo, hstop); - block_offset += m_rt->ch_count * - m_rt->stream->params.bps; - port_bo = block_offset; + port_bo += m_rt->ch_count * m_rt->stream->params.bps; } hstop = hstop - params[i].hwidth;
Signature · 1 line
2.30.2
PATCH v2 3/5 soundwire: stream: Remove unneeded checks for NULL bus
In reply to Charles KeepaxVersion of the code prior to commit d014688eb373 ("soundwire: stream:
remove bus->dev from logs on multiple buses"), used bus->dev in the error message after do_bank_switch, this necessitated some checking to ensure the bus pointer was valid. As the code no longer uses bus->dev said checking is now redundant, so remove it.
---
Changes since v1:
- Left the duplicate error prints in.
Thanks,
Charles
drivers/soundwire/stream.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/soundwire/stream.c +2 -12
@@ -1338,7 +1338,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, bool update_params) {struct sdw_master_runtime *m_rt; -struct sdw_bus *bus =NULL ; +struct sdw_bus *bus;struct sdw_master_prop *prop;struct sdw_bus_params params;int ret;
@@ -1382,11 +1382,6 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, } } -if (!bus) { -pr_err ("Configuration error in %s\n" , __func__); -return -EINVAL ; - } - ret =do_bank_switch (stream);if (ret <0 ) {pr_err ("%s: do_bank_switch failed: %d\n" , __func__, ret);
@@ -1467,7 +1462,7 @@ EXPORT_SYMBOL(sdw_prepare_stream);static int _sdw_enable_stream (struct sdw_stream_runtime *stream) {struct sdw_master_runtime *m_rt; -struct sdw_bus *bus =NULL ; +struct sdw_bus *bus;int ret;/* Enable Master(s) and Slave(s) port(s) associated with stream */
@@ -1490,11 +1485,6 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) } } -if (!bus) { -pr_err ("Configuration error in %s\n" , __func__); -return -EINVAL ; - } - ret =do_bank_switch (stream);if (ret <0 ) {pr_err ("%s: do_bank_switch failed: %d\n" , __func__, ret);
Signature · 1 line
2.30.2
Re: [PATCH v2 3/5] soundwire: stream: Remove unneeded checks for NULL bus
Quoted 7 lines · Charles Keepax
Version of the code prior to commit
d014688eb373("soundwire: stream:
removebus->devfrom logs on multiple buses"), usedbus->devin the error message afterdo_bank_switch, this necessitated some checking to ensure the bus pointer was valid. As the code no longer usesbus->devsaid checking is now redundant, so remove it.Signed-off-by Charles Keepax <[email protected]>
Good cleanup, thanks
Quoted 57 lines
---
Changes since v1:
- Left the duplicate error prints in.Thanks,
Charlesdrivers/soundwire/stream.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)drivers/soundwire/stream.c +2
-12@@ -1338,7 +1338,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, bool update_params) {struct sdw_master_runtime *m_rt; -struct sdw_bus *bus =NULL ; +struct sdw_bus *bus;struct sdw_master_prop *prop;struct sdw_bus_params params;int ret;@@ -1382,11 +1382,6 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, } } -if (!bus) { -pr_err ("Configuration error in %s\n" , __func__); -return -EINVAL ; - } - ret =do_bank_switch (stream);if (ret <0 ) {pr_err ("%s: do_bank_switch failed: %d\n" , __func__, ret);@@ -1467,7 +1462,7 @@ EXPORT_SYMBOL(sdw_prepare_stream);static int _sdw_enable_stream (struct sdw_stream_runtime *stream) {struct sdw_master_runtime *m_rt; -struct sdw_bus *bus =NULL ; +struct sdw_bus *bus;int ret;/* Enable Master(s) and Slave(s) port(s) associated with stream */ @@ -1490,11 +1485,6 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) } } -if (!bus) { -pr_err ("Configuration error in %s\n" , __func__); -return -EINVAL ; - } - ret =do_bank_switch (stream);if (ret <0 ) {pr_err ("%s: do_bank_switch failed: %d\n" , __func__, ret);
PATCH v2 4/5 soundwire: stream: Invert logic on runtime alloc flags
In reply to Charles Keepaxsdw_stream_add_slave/master have flags to indicate if the master or slave runtime where allocated in that call to the function. Currently these flags are cleared on all the paths where the runtime is not allocated, it is more logic and simpler to set the flag on the one path where the runtime is allocated.
---
Changes since v1:
- Split out of the goto patch to ease review
Also worth noting I guess this patch could be squashed with patch 1 in the series really, but I opted to leave them separate as patch 1 is a much simpler fix to be cherry-picked back to older kernels if someone needs the fixup, rather than mixing the fixup and tidy up.
Thanks,
Charles
drivers/soundwire/stream.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
drivers/soundwire/stream.c +12 -13
@@ -1854,7 +1854,7 @@ int sdw_stream_add_master(struct sdw_bus *bus, struct sdw_stream_runtime *stream) {struct sdw_master_runtime *m_rt; -bool alloc_master_rt = true; +bool alloc_master_rt = false;int ret;mutex_lock (&bus->bus_lock);
@@ -1876,10 +1876,8 @@ int sdw_stream_add_master(struct sdw_bus *bus,* it first), if so skip allocation and go to configuration */ m_rt =sdw_master_rt_find (bus, stream); -if (m_rt) { - alloc_master_rt = false; +if (m_rt) goto skip_alloc_master_rt; - } m_rt =sdw_master_rt_alloc (bus, stream);if (!m_rt) {
@@ -1888,6 +1886,8 @@ int sdw_stream_add_master(struct sdw_bus *bus, ret = -ENOMEM ; goto unlock; } + + alloc_master_rt = true; skip_alloc_master_rt:if (sdw_master_port_allocated (m_rt))
@@ -1980,8 +1980,8 @@ int sdw_stream_add_slave(struct sdw_slave *slave, {struct sdw_slave_runtime *s_rt;struct sdw_master_runtime *m_rt; -bool alloc_master_rt = true; -bool alloc_slave_rt = true; +bool alloc_master_rt = false; +bool alloc_slave_rt = false;int ret;
@@ -1992,10 +1992,8 @@ int sdw_stream_add_slave(struct sdw_slave *slave,* and go to configuration */ m_rt =sdw_master_rt_find (slave->bus, stream); -if (m_rt) { - alloc_master_rt = false; +if (m_rt) goto skip_alloc_master_rt; - }/* * If this API is invoked by Slave first then m_rt is not valid.
@@ -2009,21 +2007,22 @@ int sdw_stream_add_slave(struct sdw_slave *slave, goto unlock; } + alloc_master_rt = true; + skip_alloc_master_rt: s_rt =sdw_slave_rt_find (slave, stream); -if (s_rt) { - alloc_slave_rt = false; +if (s_rt) goto skip_alloc_slave_rt; - } s_rt =sdw_slave_rt_alloc (slave, m_rt);if (!s_rt) {dev_err (&slave->dev,"Slave runtime alloc failed for stream:%s\n" , stream->name); - alloc_slave_rt = false; ret = -ENOMEM ; goto alloc_error; } + alloc_slave_rt = true; + skip_alloc_slave_rt:if (sdw_slave_port_allocated (s_rt)) goto skip_port_alloc;
Signature · 1 line
2.30.2
Re: [PATCH v2 4/5] soundwire: stream: Invert logic on runtime alloc flags
Quoted 7 lines · Charles Keepax
sdw_stream_add_slave/master have flags to indicate if the master or slave runtime where allocated in that call to the function. Currently these flags are cleared on all the paths where the runtime is not allocated, it is more logic and simpler to set the flag on the one path where the runtime is allocated.
Signed-off-by Charles Keepax <[email protected]>
Much easier to review indeed, thanks!
Quoted 100 lines
---
Changes since v1:
- Split out of the goto patch to ease reviewAlso worth noting I guess this patch could be squashed with patch 1 in the series really, but I opted to leave them separate as patch 1 is a much simpler fix to be cherry-picked back to older kernels if someone needs the fixup, rather than mixing the fixup and tidy up.
Thanks,
Charlesdrivers/soundwire/stream.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)drivers/soundwire/stream.c +12
-13@@ -1854,7 +1854,7 @@ int sdw_stream_add_master(struct sdw_bus *bus, struct sdw_stream_runtime *stream) {struct sdw_master_runtime *m_rt; -bool alloc_master_rt = true; +bool alloc_master_rt = false;int ret;mutex_lock (&bus->bus_lock);@@ -1876,10 +1876,8 @@ int sdw_stream_add_master(struct sdw_bus *bus,* it first), if so skip allocation and go to configuration */ m_rt =sdw_master_rt_find (bus, stream); -if (m_rt) { - alloc_master_rt = false; +if (m_rt) goto skip_alloc_master_rt; - } m_rt =sdw_master_rt_alloc (bus, stream);if (!m_rt) {@@ -1888,6 +1886,8 @@ int sdw_stream_add_master(struct sdw_bus *bus, ret = -ENOMEM ; goto unlock; } + + alloc_master_rt = true; skip_alloc_master_rt:if (sdw_master_port_allocated (m_rt))@@ -1980,8 +1980,8 @@ int sdw_stream_add_slave(struct sdw_slave *slave, {struct sdw_slave_runtime *s_rt;struct sdw_master_runtime *m_rt; -bool alloc_master_rt = true; -bool alloc_slave_rt = true; +bool alloc_master_rt = false; +bool alloc_slave_rt = false;int ret;@@ -1992,10 +1992,8 @@ int sdw_stream_add_slave(struct sdw_slave *slave,* and go to configuration */ m_rt =sdw_master_rt_find (slave->bus, stream); -if (m_rt) { - alloc_master_rt = false; +if (m_rt) goto skip_alloc_master_rt; - }/* * If this API is invoked by Slave first then m_rt is not valid. @@ -2009,21 +2007,22 @@ int sdw_stream_add_slave(struct sdw_slave *slave, goto unlock; } + alloc_master_rt = true; + skip_alloc_master_rt: s_rt =sdw_slave_rt_find (slave, stream); -if (s_rt) { - alloc_slave_rt = false; +if (s_rt) goto skip_alloc_slave_rt; - } s_rt =sdw_slave_rt_alloc (slave, m_rt);if (!s_rt) {dev_err (&slave->dev,"Slave runtime alloc failed for stream:%s\n" , stream->name); - alloc_slave_rt = false; ret = -ENOMEM ; goto alloc_error; } + alloc_slave_rt = true; + skip_alloc_slave_rt:if (sdw_slave_port_allocated (s_rt)) goto skip_port_alloc;
PATCH v2 5/5 soundwire: stream: Remove unnecessary gotos
In reply to Charles KeepaxThere is a lot of code using gotos to skip small sections of code, this is a fairly dubious use of a goto, especially when the level of intentation is really low. Most of this code doesn't even breach 80 characters when naively shifted over.
Simplify the code a bit, by replacing these unnecessary gotos with simple ifs.
---
Changes since v1:
- Split out the inversion of the alloc_*_rt logic
Worth noting this patch has no functional corrections it is just a stylistic change, so as Pierre said on v1 we could just leave things as is. Personally, I would prefer to merge it though, whilst the diff is a little more of a pain to review (hopefully eased somewhat by splitting out the alloc_*_rt logic into a separate patch), the resulting code reads much nicer and the code will be read a lot more times than this patch will be.
Thanks,
Charles
drivers/soundwire/stream.c | 124 +++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 68 deletions(-)
drivers/soundwire/stream.c +56 -68
@@ -1355,25 +1355,23 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream,return -EINVAL ; } -if (!update_params) - goto program_params; - -/* Increment cumulative bus bandwidth */ -/* TODO: Update this during Device-Device support */ - bus->params.bandwidth += m_rt->stream->params.rate * - m_rt->ch_count * m_rt->stream->params.bps; - -/* Compute params */ -if (bus->compute_params) { - ret = bus->compute_params (bus); -if (ret <0 ) { -dev_err (bus->dev,"Compute params failed: %d\n" , - ret); - goto restore_params; +if (update_params) { +/* Increment cumulative bus bandwidth */ +/* TODO: Update this during Device-Device support */ + bus->params.bandwidth += m_rt->stream->params.rate * + m_rt->ch_count * m_rt->stream->params.bps; + +/* Compute params */ +if (bus->compute_params) { + ret = bus->compute_params (bus); +if (ret <0 ) { +dev_err (bus->dev,"Compute params failed: %d\n" , + ret); + goto restore_params; + } } } -program_params:/* Program params */ ret =sdw_program_params (bus, true);if (ret <0 ) {
@@ -1876,30 +1874,25 @@ int sdw_stream_add_master(struct sdw_bus *bus,* it first), if so skip allocation and go to configuration */ m_rt =sdw_master_rt_find (bus, stream); -if (m_rt) - goto skip_alloc_master_rt; - - m_rt =sdw_master_rt_alloc (bus, stream);if (!m_rt) { -dev_err (bus->dev,"%s: Master runtime alloc failed for stream:%s\n" , - __func__, stream->name); - ret = -ENOMEM ; - goto unlock; - } - - alloc_master_rt = true; -skip_alloc_master_rt: - -if (sdw_master_port_allocated (m_rt)) - goto skip_alloc_master_port; + m_rt =sdw_master_rt_alloc (bus, stream); +if (!m_rt) { +dev_err (bus->dev,"%s: Master runtime alloc failed for stream:%s\n" , + __func__, stream->name); + ret = -ENOMEM ; + goto unlock; + } - ret =sdw_master_port_alloc (m_rt, num_ports); -if (ret) - goto alloc_error; + alloc_master_rt = true; + } - stream->m_rt_count++; +if (!sdw_master_port_allocated (m_rt)) { + ret =sdw_master_port_alloc (m_rt, num_ports); +if (ret) + goto alloc_error; -skip_alloc_master_port: + stream->m_rt_count++; + } ret =sdw_master_rt_config (m_rt, stream_config);if (ret <0 )
@@ -1992,46 +1985,41 @@ int sdw_stream_add_slave(struct sdw_slave *slave,* and go to configuration */ m_rt =sdw_master_rt_find (slave->bus, stream); -if (m_rt) - goto skip_alloc_master_rt; - -/* -* If this API is invoked by Slave first then m_rt is not valid. -* So, allocate m_rt and add Slave to it. -*/ - m_rt =sdw_master_rt_alloc (slave->bus, stream);if (!m_rt) { -dev_err (&slave->dev,"%s: Master runtime alloc failed for stream:%s\n" , - __func__, stream->name); - ret = -ENOMEM ; - goto unlock; - } +/* +* If this API is invoked by Slave first then m_rt is not valid. +* So, allocate m_rt and add Slave to it. +*/ + m_rt =sdw_master_rt_alloc (slave->bus, stream); +if (!m_rt) { +dev_err (&slave->dev,"%s: Master runtime alloc failed for stream:%s\n" , + __func__, stream->name); + ret = -ENOMEM ; + goto unlock; + } - alloc_master_rt = true; + alloc_master_rt = true; + } -skip_alloc_master_rt: s_rt =sdw_slave_rt_find (slave, stream); -if (s_rt) - goto skip_alloc_slave_rt; - - s_rt =sdw_slave_rt_alloc (slave, m_rt);if (!s_rt) { -dev_err (&slave->dev,"Slave runtime alloc failed for stream:%s\n" , stream->name); - ret = -ENOMEM ; - goto alloc_error; - } - - alloc_slave_rt = true; + s_rt =sdw_slave_rt_alloc (slave, m_rt); +if (!s_rt) { +dev_err (&slave->dev,"Slave runtime alloc failed for stream:%s\n" , + stream->name); + ret = -ENOMEM ; + goto alloc_error; + } -skip_alloc_slave_rt: -if (sdw_slave_port_allocated (s_rt)) - goto skip_port_alloc; + alloc_slave_rt = true; + } - ret =sdw_slave_port_alloc (slave, s_rt, num_ports); -if (ret) - goto alloc_error; +if (!sdw_slave_port_allocated (s_rt)) { + ret =sdw_slave_port_alloc (slave, s_rt, num_ports); +if (ret) + goto alloc_error; + } -skip_port_alloc: ret =sdw_master_rt_config (m_rt, stream_config);if (ret) goto unlock;
Signature · 1 line
2.30.2
Re: [PATCH v2 5/5] soundwire: stream: Remove unnecessary gotos
Quoted 14 lines · Charles Keepax
There is a lot of code using gotos to skip small sections of code, this is a fairly dubious use of a goto, especially when the level of intentation is really low. Most of this code doesn't even breach 80 characters when naively shifted over.
Simplify the code a bit, by replacing these unnecessary gotos with simple ifs.
Signed-off-by Charles Keepax <[email protected]>---
Changes since v1:
- Split out the inversion of the alloc_*_rt logic
Quoted 7 lines
Worth noting this patch has no functional corrections it is just a stylistic change, so as Pierre said on v1 we could just leave things as is. Personally, I would prefer to merge it though, whilst the diff is a little more of a pain to review (hopefully eased somewhat by splitting out the alloc_*_rt logic into a separate patch), the resulting code reads much nicer and the code will be read a lot more times than this patch will be.
Indeed, the resulting code is much nicer to look at. I ignored the diffs and just looked at the result to make up my mind.
Quoted 171 lines
Thanks,
Charlesdrivers/soundwire/stream.c | 124 +++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 68 deletions(-)drivers/soundwire/stream.c +56
-68@@ -1355,25 +1355,23 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream,return -EINVAL ; } -if (!update_params) - goto program_params; - -/* Increment cumulative bus bandwidth */ -/* TODO: Update this during Device-Device support */ - bus->params.bandwidth += m_rt->stream->params.rate * - m_rt->ch_count * m_rt->stream->params.bps; - -/* Compute params */ -if (bus->compute_params) { - ret = bus->compute_params (bus); -if (ret <0 ) { -dev_err (bus->dev,"Compute params failed: %d\n" , - ret); - goto restore_params; +if (update_params) { +/* Increment cumulative bus bandwidth */ +/* TODO: Update this during Device-Device support */ + bus->params.bandwidth += m_rt->stream->params.rate * + m_rt->ch_count * m_rt->stream->params.bps; + +/* Compute params */ +if (bus->compute_params) { + ret = bus->compute_params (bus); +if (ret <0 ) { +dev_err (bus->dev,"Compute params failed: %d\n" , + ret); + goto restore_params; + } } } -program_params:/* Program params */ ret =sdw_program_params (bus, true);if (ret <0 ) {@@ -1876,30 +1874,25 @@ int sdw_stream_add_master(struct sdw_bus *bus,* it first), if so skip allocation and go to configuration */ m_rt =sdw_master_rt_find (bus, stream); -if (m_rt) - goto skip_alloc_master_rt; - - m_rt =sdw_master_rt_alloc (bus, stream);if (!m_rt) { -dev_err (bus->dev,"%s: Master runtime alloc failed for stream:%s\n" , - __func__, stream->name); - ret = -ENOMEM ; - goto unlock; - } - - alloc_master_rt = true; -skip_alloc_master_rt: - -if (sdw_master_port_allocated (m_rt)) - goto skip_alloc_master_port; + m_rt =sdw_master_rt_alloc (bus, stream); +if (!m_rt) { +dev_err (bus->dev,"%s: Master runtime alloc failed for stream:%s\n" , + __func__, stream->name); + ret = -ENOMEM ; + goto unlock; + } - ret =sdw_master_port_alloc (m_rt, num_ports); -if (ret) - goto alloc_error; + alloc_master_rt = true; + } - stream->m_rt_count++; +if (!sdw_master_port_allocated (m_rt)) { + ret =sdw_master_port_alloc (m_rt, num_ports); +if (ret) + goto alloc_error; -skip_alloc_master_port: + stream->m_rt_count++; + } ret =sdw_master_rt_config (m_rt, stream_config);if (ret <0 )@@ -1992,46 +1985,41 @@ int sdw_stream_add_slave(struct sdw_slave *slave,* and go to configuration */ m_rt =sdw_master_rt_find (slave->bus, stream); -if (m_rt) - goto skip_alloc_master_rt; - -/* -* If this API is invoked by Slave first then m_rt is not valid. -* So, allocate m_rt and add Slave to it. -*/ - m_rt =sdw_master_rt_alloc (slave->bus, stream);if (!m_rt) { -dev_err (&slave->dev,"%s: Master runtime alloc failed for stream:%s\n" , - __func__, stream->name); - ret = -ENOMEM ; - goto unlock; - } +/* +* If this API is invoked by Slave first then m_rt is not valid. +* So, allocate m_rt and add Slave to it. +*/ + m_rt =sdw_master_rt_alloc (slave->bus, stream); +if (!m_rt) { +dev_err (&slave->dev,"%s: Master runtime alloc failed for stream:%s\n" , + __func__, stream->name); + ret = -ENOMEM ; + goto unlock; + } - alloc_master_rt = true; + alloc_master_rt = true; + } -skip_alloc_master_rt: s_rt =sdw_slave_rt_find (slave, stream); -if (s_rt) - goto skip_alloc_slave_rt; - - s_rt =sdw_slave_rt_alloc (slave, m_rt);if (!s_rt) { -dev_err (&slave->dev,"Slave runtime alloc failed for stream:%s\n" , stream->name); - ret = -ENOMEM ; - goto alloc_error; - } - - alloc_slave_rt = true; + s_rt =sdw_slave_rt_alloc (slave, m_rt); +if (!s_rt) { +dev_err (&slave->dev,"Slave runtime alloc failed for stream:%s\n" , + stream->name); + ret = -ENOMEM ; + goto alloc_error; + } -skip_alloc_slave_rt: -if (sdw_slave_port_allocated (s_rt)) - goto skip_port_alloc; + alloc_slave_rt = true; + } - ret =sdw_slave_port_alloc (slave, s_rt, num_ports); -if (ret) - goto alloc_error; +if (!sdw_slave_port_allocated (s_rt)) { + ret =sdw_slave_port_alloc (slave, s_rt, num_ports); +if (ret) + goto alloc_error; + } -skip_port_alloc: ret =sdw_master_rt_config (m_rt, stream_config);if (ret) goto unlock;
Quoted 3 lines · Charles Keepax
The current path that skips allocating the slave runtime does not clear the
alloc_slave_rtflag, this is clearly incorrect. Add the missing clear, so the runtime won't be erroneously cleaned up.
Applied all, thanks
Signature · 1 line
~Vinod