summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-04-18 05:12:59 +0200
committerTakashi Iwai <tiwai@suse.de>2013-04-18 09:55:26 +0200
commit6134b1a25b684cc105c78631255eb33b36223c5c (patch)
tree78e328974e9a16d8f3821fa4fd901af64446b086 /sound
parentALSA: hda - Don't call vmaster hook when bus->shutdown is set (diff)
downloadlinux-6134b1a25b684cc105c78631255eb33b36223c5c.tar.xz
linux-6134b1a25b684cc105c78631255eb33b36223c5c.zip
ALSA: hda - fix error return code in patch_alc662()
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 <yongjun_wei@trendmicro.com.cn> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 74bf5f6595b9..28b3f5ac76dc 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4288,7 +4288,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;
}