* [PATCH 1/2] ASoC: wm8995: Return -EINVAL if device ID mismatch
@ 2011-09-16 2:46 Axel Lin
2011-09-16 2:47 ` [PATCH 2/2] ASoC: wm8995: Remove unused i2c variable in wm8995_remove() Axel Lin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Axel Lin @ 2011-09-16 2:46 UTC (permalink / raw)
To: linux-kernel; +Cc: Dimitris Papastamos, Mark Brown, Liam Girdwood, alsa-devel
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/wm8995.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index 5ad873f..05f7795 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -1642,6 +1642,7 @@ static int wm8995_probe(struct snd_soc_codec *codec)
if (ret != 0x8995) {
dev_err(codec->dev, "Invalid device ID: %#x\n", ret);
+ ret = -EINVAL;
goto err_reg_enable;
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] ASoC: wm8995: Remove unused i2c variable in wm8995_remove()
2011-09-16 2:46 [PATCH 1/2] ASoC: wm8995: Return -EINVAL if device ID mismatch Axel Lin
@ 2011-09-16 2:47 ` Axel Lin
2011-09-16 9:28 ` [PATCH 1/2] ASoC: wm8995: Return -EINVAL if device ID mismatch Liam Girdwood
2011-09-16 9:49 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Axel Lin @ 2011-09-16 2:47 UTC (permalink / raw)
To: linux-kernel; +Cc: Dimitris Papastamos, Mark Brown, Liam Girdwood, alsa-devel
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/wm8995.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index 05f7795..74ae599 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -1573,9 +1573,7 @@ static int wm8995_resume(struct snd_soc_codec *codec)
static int wm8995_remove(struct snd_soc_codec *codec)
{
struct wm8995_priv *wm8995;
- struct i2c_client *i2c;
- i2c = container_of(codec->dev, struct i2c_client, dev);
wm8995 = snd_soc_codec_get_drvdata(codec);
wm8995_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] ASoC: wm8995: Return -EINVAL if device ID mismatch
2011-09-16 2:46 [PATCH 1/2] ASoC: wm8995: Return -EINVAL if device ID mismatch Axel Lin
2011-09-16 2:47 ` [PATCH 2/2] ASoC: wm8995: Remove unused i2c variable in wm8995_remove() Axel Lin
@ 2011-09-16 9:28 ` Liam Girdwood
2011-09-16 9:49 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Liam Girdwood @ 2011-09-16 9:28 UTC (permalink / raw)
To: Axel Lin; +Cc: Dimitris Papastamos, alsa-devel, Mark Brown, linux-kernel
On Fri, 2011-09-16 at 10:46 +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> sound/soc/codecs/wm8995.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
> index 5ad873f..05f7795 100644
> --- a/sound/soc/codecs/wm8995.c
> +++ b/sound/soc/codecs/wm8995.c
> @@ -1642,6 +1642,7 @@ static int wm8995_probe(struct snd_soc_codec *codec)
>
> if (ret != 0x8995) {
> dev_err(codec->dev, "Invalid device ID: %#x\n", ret);
> + ret = -EINVAL;
> goto err_reg_enable;
> }
>
Both
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] ASoC: wm8995: Return -EINVAL if device ID mismatch
2011-09-16 2:46 [PATCH 1/2] ASoC: wm8995: Return -EINVAL if device ID mismatch Axel Lin
2011-09-16 2:47 ` [PATCH 2/2] ASoC: wm8995: Remove unused i2c variable in wm8995_remove() Axel Lin
2011-09-16 9:28 ` [PATCH 1/2] ASoC: wm8995: Return -EINVAL if device ID mismatch Liam Girdwood
@ 2011-09-16 9:49 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-09-16 9:49 UTC (permalink / raw)
To: Axel Lin; +Cc: Dimitris Papastamos, alsa-devel, linux-kernel, Liam Girdwood
On Fri, Sep 16, 2011 at 10:46:33AM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Applied both, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-09-16 9:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-16 2:46 [PATCH 1/2] ASoC: wm8995: Return -EINVAL if device ID mismatch Axel Lin
2011-09-16 2:47 ` [PATCH 2/2] ASoC: wm8995: Remove unused i2c variable in wm8995_remove() Axel Lin
2011-09-16 9:28 ` [PATCH 1/2] ASoC: wm8995: Return -EINVAL if device ID mismatch Liam Girdwood
2011-09-16 9:49 ` Mark Brown
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).