2013-04-18 03:13:02

by Wei Yongjun

Subject: [PATCH -next] ALSA: hda - fix error return code in patch_alc662()

From: Wei Yongjun <[email protected]>

Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.

Signed-off-by: Wei Yongjun <[email protected]>
---
sound/pci/hda/patch_realtek.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f15c36b..a3965b0 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3787,7 +3787,8 @@ static int patch_alc662(struct hda_codec *codec)
if ((alc_get_coef0(codec) & (1 << 14)) &&
codec->bus->pci->subsystem_vendor == 0x1025 &&
spec->cdefine.platform_type == 1) {
- if (alc_codec_rename(codec, "ALC272X") < 0)
+ err = alc_codec_rename(codec, "ALC272X");
+ if (err < 0)
goto error;
}

2013-04-18 04:05:05

by Wang Shilong

Subject: Re:[PATCH -next] ALSA: hda - fix error return code in patch_alc662()

Hello Wei,

+++ b/sound/pci/hda/patch_realtek.c
@@ -3787,7 +3787,8 @@ static int patch_alc662(struct hda_codec *codec)
if ((alc_get_coef0(codec) & (1 << 14)) &&
codec->bus->pci->subsystem_vendor == 0x1025 &&
spec->cdefine.platform_type == 1) {
- if (alc_codec_rename(codec, "ALC272X") < 0)

I don't think we should fix this problem. And your changelog is wrong!

Thanks,
Wang
+ err = alc_codec_rename(codec, "ALC272X");
+ if (err < 0)
goto error;
}


--

2013-04-18 04:12:00

by Wang Shilong

Subject: Re: [PATCH -next] ALSA: hda - fix error return code in patch_alc662()

Sorry, i miss something..

Thanks,
wang

> Hello Wei,
>
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -3787,7 +3787,8 @@ static int patch_alc662(struct hda_codec *codec)
> if ((alc_get_coef0(codec) & (1 << 14)) &&
> codec->bus->pci->subsystem_vendor == 0x1025 &&
> spec->cdefine.platform_type == 1) {
> - if (alc_codec_rename(codec, "ALC272X") < 0)
>
> I don't think we should fix this problem. And your changelog is wrong!
>
> Thanks,
> Wang
> + err = alc_codec_rename(codec, "ALC272X");
> + if (err < 0)
> goto error;
> }
>
>
> --
>

2013-04-18 07:55:56

by Takashi Iwai

Subject: Re: [PATCH -next] ALSA: hda - fix error return code in patch_alc662()

At Thu, 18 Apr 2013 11:12:59 +0800,
Wei Yongjun wrote:
>
> From: Wei Yongjun <[email protected]>
>
> Fix to return a negative error code from the error handling
> case instead of 0, as returned elsewhere in this function.
>
> Signed-off-by: Wei Yongjun <[email protected]>

Thanks, applied.


Takashi

> ---
> sound/pci/hda/patch_realtek.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index f15c36b..a3965b0 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -3787,7 +3787,8 @@ static int patch_alc662(struct hda_codec *codec)
> if ((alc_get_coef0(codec) & (1 << 14)) &&
> codec->bus->pci->subsystem_vendor == 0x1025 &&
> spec->cdefine.platform_type == 1) {
> - if (alc_codec_rename(codec, "ALC272X") < 0)
> + err = alc_codec_rename(codec, "ALC272X");
> + if (err < 0)
> goto error;
> }
>
>