From 24e0f2f46ce8a1636daeacecaaa697a0be19ec45 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 20 Mar 2013 15:42:00 +0100 Subject: [PATCH] --- yaml --- r: 361619 b: refs/heads/master c: a686fd141e20244ad75f80ad54706da07d7bb90a h: refs/heads/master i: 361617: cbcc7137aedaafb3238d3e002dabe8689f1619d8 361615: 4bbc9a79e6e46d8ea7caf24963a88b5329d54d31 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ffe487067c1b..9f4f221a68cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83ea5d18d74f032a760fecde78c0210f66f7f70c +refs/heads/master: a686fd141e20244ad75f80ad54706da07d7bb90a diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index a9ebcf9e3710..ecdf30eb5879 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -3144,7 +3144,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)