From: Vinod Koul <vinod.koul@intel.com>
To: alsa-devel@alsa-project.org
Cc: liam.r.girdwood@linux.intel.com, patches.audio@intel.com,
broonie@kernel.org, Guneshwor Singh <guneshwor.o.singh@intel.com>,
Vinod Koul <vinod.koul@intel.com>
Subject: [PATCH 3/3] ASoC: Intel: Skylake: Return negative error code
Date: Thu, 27 Apr 2017 12:21:22 +0530 [thread overview]
Message-ID: <1493275882-27708-3-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1493275882-27708-1-git-send-email-vinod.koul@intel.com>
From: Guneshwor Singh <guneshwor.o.singh@intel.com>
skl_tplg_add_pipe() returned EEXIST instead of negative EEXIST, so fix that
and handle the return value as well.
Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
sound/soc/intel/skylake/skl-topology.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 0e459d3eb17a..29f68713a231 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1711,7 +1711,7 @@ static int skl_tplg_add_pipe(struct device *dev,
list_for_each_entry(ppl, &skl->ppl_list, node) {
if (ppl->pipe->ppl_id == tkn_elem->value) {
mconfig->pipe = ppl->pipe;
- return EEXIST;
+ return -EEXIST;
}
}
@@ -2003,11 +2003,13 @@ static int skl_tplg_get_token(struct device *dev,
ret = skl_tplg_add_pipe(dev,
mconfig, skl, tkn_elem);
- if (ret < 0)
+ if (ret < 0) {
+ if (ret == -EEXIST) {
+ is_pipe_exists = 1;
+ break;
+ }
return is_pipe_exists;
-
- if (ret == EEXIST)
- is_pipe_exists = 1;
+ }
break;
--
1.9.1
next prev parent reply other threads:[~2017-04-27 6:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-27 6:51 [PATCH 1/3] ASoC: Intel: Skylake: Fix uninitialized pointer usage Vinod Koul
2017-04-27 6:51 ` [PATCH 2/3] ASoC: Intel: Skylake: Fix unused variable warning Vinod Koul
2017-04-30 12:58 ` Applied "ASoC: Intel: Skylake: Fix unused variable warning" to the asoc tree Mark Brown
2017-04-27 6:51 ` Vinod Koul [this message]
2017-04-30 12:58 ` Applied "ASoC: Intel: Skylake: Return negative error code" " Mark Brown
2017-04-27 22:46 ` [PATCH 1/3] ASoC: Intel: Skylake: Fix uninitialized pointer usage Takashi Sakamoto
2017-04-28 2:30 ` Vinod Koul
2017-04-30 12:58 ` Applied "ASoC: Intel: Skylake: fix uninitialized pointer use" to the asoc tree Mark Brown
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=1493275882-27708-3-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=guneshwor.o.singh@intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=patches.audio@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).