projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cb7cef9 BS |
1 | From: Takashi Iwai <tiwai@suse.de> |
| 2 | Subject: ALSA: hda - Fix SPDIF mute on IDT/STAC codecs | |
| 3 | Patch-mainline: 2.6.28-rc3 | |
| 4 | References: | |
| 5 | ||
| 6 | The SPDIF mute switch code seems broken. It doesn't set unmute bits | |
| 7 | properly. Also it contains the duplicated lines (merge error?) to be | |
| 8 | cleaned up. | |
| 9 | ||
| 10 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | |
| 11 | ||
| 12 | --- | |
| 13 | sound/pci/hda/patch_sigmatel.c | 4 +--- | |
| 14 | 1 file changed, 1 insertion(+), 3 deletions(-) | |
| 15 | ||
| 16 | --- a/sound/pci/hda/patch_sigmatel.c | |
| 17 | +++ b/sound/pci/hda/patch_sigmatel.c | |
| 18 | @@ -567,10 +567,8 @@ static int stac92xx_smux_enum_put(struct | |
| 19 | nid = codec->slave_dig_outs[smux_idx - 1]; | |
| 20 | if (spec->cur_smux[smux_idx] == smux->num_items - 1) | |
| 21 | val = AMP_OUT_MUTE; | |
| 22 | - if (smux_idx == 0) | |
| 23 | - nid = spec->multiout.dig_out_nid; | |
| 24 | else | |
| 25 | - nid = codec->slave_dig_outs[smux_idx - 1]; | |
| 26 | + val = AMP_OUT_UNMUTE; | |
| 27 | /* un/mute SPDIF out */ | |
| 28 | snd_hda_codec_write_cache(codec, nid, 0, | |
| 29 | AC_VERB_SET_AMP_GAIN_MUTE, val); |