mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
soundwire: Fix incorrect exit after configuring stream
In sdw_stream_add_master() after the Master ports are configured, the stream is released incorrectly. So, fix it by avoiding stream release after configuring the Master for the stream. While at it, rename the label appropriately. 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:
parent
0aebe40bae
commit
3fef1a2259
1 changed files with 4 additions and 2 deletions
|
|
@ -1112,7 +1112,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,9 +1123,11 @@ int sdw_stream_add_master(struct sdw_bus *bus,
|
|||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
goto unlock;
|
||||
|
||||
stream_error:
|
||||
sdw_release_master_stream(stream);
|
||||
error:
|
||||
unlock:
|
||||
mutex_unlock(&bus->bus_lock);
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue