diff options
| author | Bard Liao <yung-chuan.liao@linux.intel.com> | 2020-01-14 17:52:24 -0600 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-02-13 15:57:37 +0530 |
| commit | c32464c9393d0a426b5abbf01980ff5ecfb34a98 (patch) | |
| tree | e675a43f7cb4377beb5196f5c999aabf2e77de44 /drivers/soundwire | |
| parent | 59528807715f81f123631f57446b08219efa7526 (diff) | |
| download | linux-c32464c9393d0a426b5abbf01980ff5ecfb34a98.tar.gz linux-c32464c9393d0a426b5abbf01980ff5ecfb34a98.tar.bz2 linux-c32464c9393d0a426b5abbf01980ff5ecfb34a98.zip | |
soundwire: stream: only prepare stream when it is configured.
We don't need to prepare the stream again if the stream is already
prepared.
sdw_prepare_stream() could be called multiple times without calling
sdw_deprepare_stream(). We call sdw_prepare_stream() in the prepare
dai ops and sdw_deprepare_stream() in the hw_free dai ops. If an xrun
happens, sdw_prepare_stream() will be called but
sdw_deprepare_stream() will not, which results in an imbalance and an
invalid total bandwidth.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20200114235227.14502-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/soundwire')
| -rw-r--r-- | drivers/soundwire/stream.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 6aa0b5d370c0..bd0bddf73830 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -1544,7 +1544,7 @@ restore_params: */ int sdw_prepare_stream(struct sdw_stream_runtime *stream) { - int ret = 0; + int ret; if (!stream) { pr_err("SoundWire: Handle not found for stream\n"); @@ -1553,6 +1553,11 @@ int sdw_prepare_stream(struct sdw_stream_runtime *stream) sdw_acquire_bus_lock(stream); + if (stream->state == SDW_STREAM_PREPARED) { + ret = 0; + goto state_err; + } + if (stream->state != SDW_STREAM_CONFIGURED && stream->state != SDW_STREAM_DEPREPARED && stream->state != SDW_STREAM_DISABLED) { |