* [PATCH] ASoC: ad1980: Return proper error if vendor id mismatch
@ 2011-09-06 2:37 Axel Lin
2011-09-08 21:14 ` Girdwood, Liam
2011-09-08 22:43 ` Mark Brown
0 siblings, 2 replies; 4+ messages in thread
From: Axel Lin @ 2011-09-06 2:37 UTC (permalink / raw)
To: linux-kernel; +Cc: Roy Huang, Cliff Cai, Liam Girdwood, Mark Brown, alsa-devel
Return -ENODEV instead of 0 if vendor id mismatch.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/ad1980.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index 923b364..4c0fc30 100644
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -200,18 +200,22 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec)
}
/* Read out vendor ID to make sure it is ad1980 */
- if (ac97_read(codec, AC97_VENDOR_ID1) != 0x4144)
+ if (ac97_read(codec, AC97_VENDOR_ID1) != 0x4144) {
+ ret = -ENODEV;
goto reset_err;
+ }
vendor_id2 = ac97_read(codec, AC97_VENDOR_ID2);
if (vendor_id2 != 0x5370) {
- if (vendor_id2 != 0x5374)
+ if (vendor_id2 != 0x5374) {
+ ret = -ENODEV;
goto reset_err;
- else
+ } else {
printk(KERN_WARNING "ad1980: "
"Found AD1981 - only 2/2 IN/OUT Channels "
"supported\n");
+ }
}
/* unmute captures and playbacks volume */
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: ad1980: Return proper error if vendor id mismatch
2011-09-06 2:37 [PATCH] ASoC: ad1980: Return proper error if vendor id mismatch Axel Lin
@ 2011-09-08 21:14 ` Girdwood, Liam
2011-09-08 22:43 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Girdwood, Liam @ 2011-09-08 21:14 UTC (permalink / raw)
To: Axel Lin; +Cc: Roy Huang, Cliff Cai, Mark Brown, linux-kernel, alsa-devel
On 6 September 2011 03:37, Axel Lin <axel.lin@gmail.com> wrote:
> Return -ENODEV instead of 0 if vendor id mismatch.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> sound/soc/codecs/ad1980.c | 10 +++++++---
> 1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
> index 923b364..4c0fc30 100644
> --- a/sound/soc/codecs/ad1980.c
> +++ b/sound/soc/codecs/ad1980.c
> @@ -200,18 +200,22 @@ static int ad1980_soc_probe(struct snd_soc_codec
> *codec)
> }
>
> /* Read out vendor ID to make sure it is ad1980 */
> - if (ac97_read(codec, AC97_VENDOR_ID1) != 0x4144)
> + if (ac97_read(codec, AC97_VENDOR_ID1) != 0x4144) {
> + ret = -ENODEV;
> goto reset_err;
> + }
>
> vendor_id2 = ac97_read(codec, AC97_VENDOR_ID2);
>
> if (vendor_id2 != 0x5370) {
> - if (vendor_id2 != 0x5374)
> + if (vendor_id2 != 0x5374) {
> + ret = -ENODEV;
> goto reset_err;
> - else
> + } else {
> printk(KERN_WARNING "ad1980: "
> "Found AD1981 - only 2/2 IN/OUT Channels "
> "supported\n");
> + }
> }
>
> /* unmute captures and playbacks volume */
> --
> 1.7.4.1
>
>
>
>
Acked-by Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: ad1980: Return proper error if vendor id mismatch
2011-09-06 2:37 [PATCH] ASoC: ad1980: Return proper error if vendor id mismatch Axel Lin
@ 2011-09-08 22:43 ` Mark Brown
2011-09-08 22:43 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-09-08 22:43 UTC (permalink / raw)
To: Axel Lin; +Cc: Roy Huang, Cliff Cai, linux-kernel, alsa-devel, Liam Girdwood
On Tue, Sep 06, 2011 at 10:37:48AM +0800, Axel Lin wrote:
> Return -ENODEV instead of 0 if vendor id mismatch.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: ad1980: Return proper error if vendor id mismatch
@ 2011-09-08 22:43 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-09-08 22:43 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Roy Huang, Cliff Cai, Liam Girdwood, alsa-devel
On Tue, Sep 06, 2011 at 10:37:48AM +0800, Axel Lin wrote:
> Return -ENODEV instead of 0 if vendor id mismatch.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-09-08 23:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-06 2:37 [PATCH] ASoC: ad1980: Return proper error if vendor id mismatch Axel Lin
2011-09-08 21:14 ` Girdwood, Liam
2011-09-08 22:43 ` Mark Brown
2011-09-08 22:43 ` Mark Brown
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.