All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shreyas NC <shreyas.nc@intel.com>
To: alsa-devel@alsa-project.org
Cc: patches.audio@intel.com, gregkh@linuxfoundation.org,
	pierre-louis.bossart@linux.intel.com, vkoul@kernel.org,
	Shreyas NC <shreyas.nc@intel.com>,
	sanyog.r.kale@intel.com
Subject: [PATCH v7 02/10] soundwire: Fix incorrect exit after configuring stream
Date: Thu, 26 Jul 2018 17:12:34 +0530	[thread overview]
Message-ID: <1532605362-19282-3-git-send-email-shreyas.nc@intel.com> (raw)
In-Reply-To: <1532605362-19282-1-git-send-email-shreyas.nc@intel.com>

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>
---
 drivers/soundwire/stream.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index e6ee4ba..eaaa180 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -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;
 }
-- 
2.7.4

  parent reply	other threads:[~2018-07-26 11:44 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-26 11:42 [PATCH v7 00/10] soundwire: Add multi link support Shreyas NC
2018-07-26 11:42 ` [PATCH v7 01/10] soundwire: Fix duplicate stream state assignment Shreyas NC
2018-07-26 11:42 ` Shreyas NC [this message]
2018-07-26 11:42 ` [PATCH v7 03/10] soundwire: Fix acquiring bus lock twice during master release Shreyas NC
2018-07-26 11:42 ` [PATCH v7 04/10] Documentation: soundwire: Add documentation for multi link Shreyas NC
2018-07-26 11:42 ` [PATCH v7 05/10] soundwire: Initialize completion for defer messages Shreyas NC
2018-07-26 11:42 ` [PATCH v7 06/10] soundwire: Add support to lock across bus instances Shreyas NC
2018-07-26 11:42 ` [PATCH v7 07/10] soundwire: Handle multiple master instances in a stream Shreyas NC
2018-07-26 11:42 ` [PATCH v7 08/10] soundwire: keep track of Masters " Shreyas NC
2018-07-26 11:42 ` [PATCH v7 09/10] soundwire: Add support for multi link bank switch Shreyas NC
2018-07-26 14:02   ` Pierre-Louis Bossart
2018-07-27  3:22     ` Shreyas Nc
2018-07-26 11:42 ` [PATCH v7 10/10] soundwire: intel: Add pre/post bank switch ops Shreyas NC

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=1532605362-19282-3-git-send-email-shreyas.nc@intel.com \
    --to=shreyas.nc@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=patches.audio@intel.com \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=sanyog.r.kale@intel.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.