diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-23 08:38:23 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-23 08:38:23 +0100 |
| commit | 524027916e5763a0c9a7da80aa8dd013a14a0440 (patch) | |
| tree | ed576766b050122065f5c548adb22f9ce277a2a0 /sound/pci/hda/patch_sigmatel.c | |
| parent | 75d1aeb9d6899b10420d10284e8ea894b2794224 (diff) | |
| parent | 9dc8398bab52931435fce403ce2eaf5822f28e58 (diff) | |
| download | talos-obmc-linux-524027916e5763a0c9a7da80aa8dd013a14a0440.tar.gz talos-obmc-linux-524027916e5763a0c9a7da80aa8dd013a14a0440.zip | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index a4526d008042..2f08b434bbd8 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -3778,15 +3778,16 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out err = snd_hda_attach_beep_device(codec, nid); if (err < 0) return err; - /* IDT/STAC codecs have linear beep tone parameter */ - codec->beep->linear_tone = 1; - /* if no beep switch is available, make its own one */ - caps = query_amp_caps(codec, nid, HDA_OUTPUT); - if (codec->beep && - !((caps & AC_AMPCAP_MUTE) >> AC_AMPCAP_MUTE_SHIFT)) { - err = stac92xx_beep_switch_ctl(codec); - if (err < 0) - return err; + if (codec->beep) { + /* IDT/STAC codecs have linear beep tone parameter */ + codec->beep->linear_tone = 1; + /* if no beep switch is available, make its own one */ + caps = query_amp_caps(codec, nid, HDA_OUTPUT); + if (!(caps & AC_AMPCAP_MUTE)) { + err = stac92xx_beep_switch_ctl(codec); + if (err < 0) + return err; + } } } #endif |
