diff options
| author | Takashi Iwai | 2012-10-12 17:24:51 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2012-10-17 08:42:00 +0200 |
| commit | dcda5806165c155d90b9aa466a1602cf4726012b (patch) | |
| tree | 2608238090cb39ef41e4950900026fa9434fa4bb /sound/pci/hda/patch_hdmi.c | |
| parent | ALSA: hda - Print PCI device name at "spurious message" warnings (diff) | |
| download | kernel-qcow2-linux-dcda5806165c155d90b9aa466a1602cf4726012b.tar.gz kernel-qcow2-linux-dcda5806165c155d90b9aa466a1602cf4726012b.tar.xz kernel-qcow2-linux-dcda5806165c155d90b9aa466a1602cf4726012b.zip | |
ALSA: hda - Add workaround for conflicting IEC958 controls
When both an SPDIF and an HDMI device are created on the same card
instance, multiple IEC958 controls are created with indices=0, 1, ...
But the alsa-lib configuration can't know which index corresponds
actually to which PCM device, and both the SPDIF and the HDMI
configurations point to the first IEC958 control wrongly.
This patch introduces a (hackish and ugly) workaround: the IEC958
controls for the SPDIF device are re-labeled with device=1 when HDMI
coexists. The device=1 corresponds to the actual PCM device for
SPDIF, so it's anyway a better representation. In future, HDMI
controls should be moved with the corresponding PCM device number,
too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 71555cc54db1..39ca1005995d 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1589,9 +1589,10 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) if (err < 0) return err; - err = snd_hda_create_spdif_out_ctls(codec, - per_pin->pin_nid, - per_pin->mux_nids[0]); + err = snd_hda_create_dig_out_ctls(codec, + per_pin->pin_nid, + per_pin->mux_nids[0], + HDA_PCM_TYPE_HDMI); if (err < 0) return err; snd_hda_spdif_ctls_unassign(codec, pin_idx); |