mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

soundwire: Fix incorrect exit after configuring stream

Browse source 
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 <shreyas.nc@intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Shreyas NC 2018-07-27 14:44:09 +05:30 committed by Vinod Koul
parent 0aebe40bae
commit 3fef1a2259
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/soundwire/stream.c
View file

@ -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;
}