From: Axel Lin <axel.lin@gmail.com>
To: alsa-devel@alsa-project.org
Cc: Philipp Zabel <philipp.zabel@gmail.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>, Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 2/3] ASoC: uda1380: Fix missed uda1380_reset call if pdata->gpio_power is a valid gpio
Date: Sun, 04 Dec 2011 19:37:32 +0800 [thread overview]
Message-ID: <1322998652.12391.3.camel@phoenix> (raw)
In-Reply-To: <1322998520.12391.1.camel@phoenix>
Current code does not call uda1380_reset() in uda1380_probe() if
pdata->gpio_power is a valid gpio. Fix it.
Also remove a redundant "Failed to issue reset" error message.
We already show error message in uda1380_reset() error path.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
I don't has this hardware, I'd appreciate if someone can test this patch.
Axel
sound/soc/codecs/uda1380.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 3a238cb..7ebfbeb 100644
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -747,14 +747,12 @@ static int uda1380_probe(struct snd_soc_codec *codec)
ret = gpio_direction_output(pdata->gpio_power, 0);
if (ret)
goto err_gpio_power_conf;
- } else {
- ret = uda1380_reset(codec);
- if (ret) {
- dev_err(codec->dev, "Failed to issue reset\n");
- goto err_reset;
- }
}
+ ret = uda1380_reset(codec);
+ if (ret)
+ goto err_reset;
+
INIT_WORK(&uda1380->work, uda1380_flush_work);
/* power on device */
--
1.7.5.4
next prev parent reply other threads:[~2011-12-04 11:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-04 11:35 [PATCH 1/3] ASoC: uda1380: Return proper error in uda1380_modinit failure path Axel Lin
2011-12-04 11:37 ` Axel Lin [this message]
2011-12-04 13:02 ` [PATCH 2/3] ASoC: uda1380: Fix missed uda1380_reset call if pdata->gpio_power is a valid gpio Mark Brown
2011-12-04 18:55 ` Vasily
2011-12-04 11:38 ` [PATCH 3/3] ASoC: uda1380: Convert to gpio_request_one() Axel Lin
2011-12-04 23:46 ` Mark Brown
2011-12-04 13:00 ` [PATCH 1/3] ASoC: uda1380: Return proper error in uda1380_modinit failure path Mark Brown
2011-12-04 13:44 ` Axel Lin
2011-12-04 23:39 ` 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=1322998652.12391.3.camel@phoenix \
--to=axel.lin@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lars@metafoo.de \
--cc=lrg@ti.com \
--cc=philipp.zabel@gmail.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 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.