Commit 3fef1a22 authored by Shreyas NC's avatar Shreyas NC Committed by Vinod Koul

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: default avatarShreyas NC <shreyas.nc@intel.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 0aebe40b
...@@ -1112,7 +1112,7 @@ int sdw_stream_add_master(struct sdw_bus *bus, ...@@ -1112,7 +1112,7 @@ int sdw_stream_add_master(struct sdw_bus *bus,
"Master runtime config failed for stream:%s", "Master runtime config failed for stream:%s",
stream->name); stream->name);
ret = -ENOMEM; ret = -ENOMEM;
goto error; goto unlock;
} }
ret = sdw_config_stream(bus->dev, stream, stream_config, false); ret = sdw_config_stream(bus->dev, stream, stream_config, false);
...@@ -1123,9 +1123,11 @@ int sdw_stream_add_master(struct sdw_bus *bus, ...@@ -1123,9 +1123,11 @@ int sdw_stream_add_master(struct sdw_bus *bus,
if (ret) if (ret)
goto stream_error; goto stream_error;
goto unlock;
stream_error: stream_error:
sdw_release_master_stream(stream); sdw_release_master_stream(stream);
error: unlock:
mutex_unlock(&bus->bus_lock); mutex_unlock(&bus->bus_lock);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment