summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-03-20 15:42:00 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-28 12:12:04 -0700
commite97814511e1e878eea551d17068a0595b6afba8b (patch)
treeb00b58084b3c54bfd90210b37bf89e868c30d48a
parent184e91c6933115a6a65566561ecc921b9af5f902 (diff)
downloadlinux-3.10-e97814511e1e878eea551d17068a0595b6afba8b.tar.gz
linux-3.10-e97814511e1e878eea551d17068a0595b6afba8b.tar.bz2
linux-3.10-e97814511e1e878eea551d17068a0595b6afba8b.zip
ALSA: hda - Fix typo in checking IEC958 emphasis bit
commit a686fd141e20244ad75f80ad54706da07d7bb90a upstream. 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 <martin.weishart@telosalliance.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/pci/hda/hda_codec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index cec747998e5..28e070ad3da 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2910,7 +2910,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)