summaryrefslogtreecommitdiffstats
path: root/drivers/soundwire/stream.c
diff options
context:
space:
mode:
authorRander Wang <rander.wang@intel.com>2020-01-15 00:52:26 +0100
committerVinod Koul <vkoul@kernel.org>2020-02-13 11:27:37 +0100
commit60835022e196de1a4d73c249e99f34b7204ca267 (patch)
tree21571c8c1a5cd68db96e128d23a3453332777be6 /drivers/soundwire/stream.c
parentsoundwire: stream: do not update parameters during DISABLED-PREPARED transition (diff)
downloadlinux-60835022e196de1a4d73c249e99f34b7204ca267.tar.xz
linux-60835022e196de1a4d73c249e99f34b7204ca267.zip
soundwire: stream: fix support for multiple Slaves on the same link
The existing code will unconditionally return after dealing with the first Slave on a link. This return should only happen when there is an error case. Tested on Comet Lake platform. Signed-off-by: Rander Wang <rander.wang@intel.com> Link: https://lore.kernel.org/r/20200114235227.14502-5-pierre-louis.bossart@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/soundwire/stream.c')
-rw-r--r--drivers/soundwire/stream.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index c28ce7f0d742..da10f38298c0 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -587,10 +587,11 @@ static int sdw_notify_config(struct sdw_master_runtime *m_rt)
if (slave->ops->bus_config) {
ret = slave->ops->bus_config(slave, &bus->params);
- if (ret < 0)
+ if (ret < 0) {
dev_err(bus->dev, "Notify Slave: %d failed\n",
slave->dev_num);
- return ret;
+ return ret;
+ }
}
}