diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-03-14 11:18:32 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 14:00:24 +0400 |
| commit | 2626a263ffc2369499442933b1c313de0a066ede (patch) | |
| tree | 620a20f4b1b92a36170aeb635aac1a8b52e7ae38 | |
| parent | d654a660355f9dc30d3a6bf1493d32363bde8570 (diff) | |
| download | linux-2626a263ffc2369499442933b1c313de0a066ede.tar.xz | |
[ALSA] hda-codec - Fix orphan Headphone controls in STAC codecs
Currently, the headphone controls are created as Master wrongly in
some cases, and this prevents the virtual master controls.
The patch fixes the problem by simply using "Headphone" always for
headphone controls.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index b75bf3475653..b8e69a1b93f0 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -2509,12 +2509,8 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec, return err; } if (spec->multiout.hp_nid) { - const char *pfx; - if (old_num_dacs == spec->multiout.num_dacs) - pfx = "Master"; - else - pfx = "Headphone"; - err = create_controls(spec, pfx, spec->multiout.hp_nid, 3); + err = create_controls(spec, "Headphone", + spec->multiout.hp_nid, 3); if (err < 0) return err; } |