diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-03 15:43:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-03 15:43:11 +0100 |
| commit | b70e9def40dea91c0d8fbef8960b2ed7ee88a231 (patch) | |
| tree | 48c665dcd282529a6283f1bb3c60529e2b48c62e /sound | |
| parent | 67fb5d7f8fcf2c9c4da714bfb9ff73d959789263 (diff) | |
| parent | 1db7ccdb2ef4dbd8df0e0f742c9da9b054d899ba (diff) | |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index efa4225f5fd6..8e2bb0aad0ae 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -5423,7 +5423,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec) snd_hda_codec_write_cache(codec, codec->afg, 0, 0x7ED, 0); codec->no_trigger_sense = 1; codec->spec = spec; - spec->linear_tone_beep = 1; + spec->linear_tone_beep = 0; codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs; spec->digbeep_nid = 0x21; spec->dmic_nids = stac92hd83xxx_dmic_nids; @@ -5471,7 +5471,6 @@ again: spec->num_pins = ARRAY_SIZE(stac92hd88xxx_pin_nids); spec->pin_nids = stac92hd88xxx_pin_nids; spec->mono_nid = 0; - spec->digbeep_nid = 0; spec->num_pwrs = 0; break; case 0x111d7604: |