From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130411202550.797778760@goodmis.org> Date: Thu, 11 Apr 2013 16:25:31 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Weishart , Takashi Iwai Subject: [ 028/171 ] ALSA: hda - Fix typo in checking IEC958 emphasis bit References: <20130411202503.783159048@goodmis.org> Content-Disposition: inline; filename=0028-ALSA-hda-Fix-typo-in-checking-IEC958-emphasis-bit.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.2 stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai [ Upstream commit a686fd141e20244ad75f80ad54706da07d7bb90a ] There is a typo in convert_to_spdif_status() about checking the emphasis IEC958 status bit. It should check the given value instead of the resultant value. Reported-by: Martin Weishart Cc: Signed-off-by: Takashi Iwai Signed-off-by: Steven Rostedt --- sound/pci/hda/hda_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 38fdefc..f60254d 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -2970,7 +2970,7 @@ static unsigned int convert_to_spdif_status(unsigned short val) if (val & AC_DIG1_PROFESSIONAL) sbits |= IEC958_AES0_PROFESSIONAL; if (sbits & IEC958_AES0_PROFESSIONAL) { - if (sbits & AC_DIG1_EMPHASIS) + if (val & AC_DIG1_EMPHASIS) sbits |= IEC958_AES0_PRO_EMPHASIS_5015; } else { if (val & AC_DIG1_EMPHASIS) -- 1.7.10.4