Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Bard Liao <yung-chuan.liao@linux.intel.com>
To: alsa-devel@alsa-project.org, vkoul@kernel.org
Cc: vinod.koul@linaro.org, gregkh@linuxfoundation.org,
	pierre-louis.bossart@linux.intel.com,
	linux-kernel@vger.kernel.org, srinivas.kandagatla@linaro.org,
	sanyog.r.kale@intel.com, bard.liao@intel.com
Subject: [PATCH 02/19] soundwire: stream: add slave runtime to list earlier
Date: Wed, 26 Jan 2022 09:16:58 +0800	[thread overview]
Message-ID: <20220126011715.28204-3-yung-chuan.liao@linux.intel.com> (raw)
In-Reply-To: <20220126011715.28204-1-yung-chuan.liao@linux.intel.com>

From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

sdw_config_stream() only verifies the compatibility between
information provided by the Slave driver and the stream configuration.

There is no problem if we add the slave runtime to the list earlier.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 drivers/soundwire/stream.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index a30d0fb4871b..a75d3576bfcf 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -1373,21 +1373,12 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
 		ret = -ENOMEM;
 		goto stream_error;
 	}
-
-	ret = sdw_config_stream(&slave->dev, stream, stream_config, true);
-	if (ret) {
-		/*
-		 * sdw_release_master_stream will release s_rt in slave_rt_list in
-		 * stream_error case, but s_rt is only added to slave_rt_list
-		 * when sdw_config_stream is successful, so free s_rt explicitly
-		 * when sdw_config_stream is failed.
-		 */
-		kfree(s_rt);
-		goto stream_error;
-	}
-
 	list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list);
 
+	ret = sdw_config_stream(&slave->dev, stream, stream_config, true);
+	if (ret)
+		goto stream_error;
+
 	ret = sdw_slave_port_config(slave, s_rt, port_config, num_ports);
 	if (ret)
 		goto stream_error;
-- 
2.17.1


  parent reply	other threads:[~2022-01-26  1:19 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-26  1:16 [PATCH 00/19] soundwire: stream: cleanup of 'stream' support Bard Liao
2022-01-26  1:16 ` [PATCH 01/19] soundwire: stream: remove unused parameter in sdw_stream_add_slave Bard Liao
2022-01-26  1:16 ` Bard Liao [this message]
2022-01-26  1:16 ` [PATCH 03/19] soundwire: stream: simplify check on port range Bard Liao
2022-01-26  1:17 ` [PATCH 04/19] soundwire: stream: add alloc/config/free helpers for ports Bard Liao
2022-01-26  1:17 ` [PATCH 05/19] soundwire: stream: split port allocation and configuration loops Bard Liao
2022-01-26  1:17 ` [PATCH 06/19] soundwire: stream: split alloc and config in two functions Bard Liao
2022-01-26  1:17 ` [PATCH 07/19] soundwire: stream: add 'slave' prefix for port range checks Bard Liao
2022-01-26  1:17 ` [PATCH 08/19] soundwire: stream: group sdw_port and sdw_master/slave_port functions Bard Liao
2022-01-26  1:17 ` [PATCH 09/19] soundwire: stream: simplify sdw_alloc_master_rt() Bard Liao
2022-01-26  1:17 ` [PATCH 10/19] soundwire: stream: split sdw_alloc_master_rt() in alloc and config Bard Liao
2022-01-26  1:17 ` [PATCH 11/19] soundwire: stream: move sdw_alloc_slave_rt() before 'master' helpers Bard Liao
2022-01-26  1:17 ` [PATCH 12/19] soundwire: stream: split sdw_alloc_slave_rt() in alloc and config Bard Liao
2022-01-26  1:17 ` [PATCH 13/19] soundwire: stream: group sdw_stream_ functions Bard Liao
2022-01-26  1:17 ` [PATCH 14/19] soundwire: stream: rename and move master/slave_rt_free routines Bard Liao
2022-01-26  1:17 ` [PATCH 15/19] soundwire: stream: move list addition to sdw_slave_alloc_rt() Bard Liao
2022-01-26  1:17 ` [PATCH 16/19] soundwire: stream: separate alloc and config within sdw_stream_add_xxx() Bard Liao
2022-01-26  1:17 ` [PATCH 17/19] soundwire: stream: introduce sdw_slave_rt_find() helper Bard Liao
2022-01-26  1:17 ` [PATCH 18/19] soundwire: stream: sdw_stream_add_ functions can be called multiple times Bard Liao
2022-01-26  1:17 ` [PATCH 19/19] soundwire: stream: make enable/disable/deprepare idempotent Bard Liao
2022-02-11  6:48 ` [PATCH 00/19] soundwire: stream: cleanup of 'stream' support Vinod Koul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220126011715.28204-3-yung-chuan.liao@linux.intel.com \
    --to=yung-chuan.liao@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=bard.liao@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=sanyog.r.kale@intel.com \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=vinod.koul@linaro.org \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox