diff options
| author | Zhao Edgar Liu - Sun Microsystems <Edgar.Liu@Sun.COM> | 2010-03-19 10:22:54 +0800 |
|---|---|---|
| committer | Zhao Edgar Liu - Sun Microsystems <Edgar.Liu@Sun.COM> | 2010-03-19 10:22:54 +0800 |
| commit | a9c8b202b249bc7993fff59ea8f40d5a349720ba (patch) | |
| tree | cf52aebc0309fced536d32c3d58c933b8de1d5ca /usr/src/uts/common/io/audio | |
| parent | 4223fc7cdcf5a51019f631eec2b4217ddf736451 (diff) | |
| download | illumos-gate-a9c8b202b249bc7993fff59ea8f40d5a349720ba.tar.gz | |
6932506 The fix in 6862287 does not fix the mute issue
Diffstat (limited to 'usr/src/uts/common/io/audio')
| -rw-r--r-- | usr/src/uts/common/io/audio/drv/audiohd/audiohd.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/usr/src/uts/common/io/audio/drv/audiohd/audiohd.c b/usr/src/uts/common/io/audio/drv/audiohd/audiohd.c index 5df3d6e572..c81da30967 100644 --- a/usr/src/uts/common/io/audio/drv/audiohd/audiohd.c +++ b/usr/src/uts/common/io/audio/drv/audiohd/audiohd.c @@ -1208,25 +1208,20 @@ audiohd_set_output_gain(audiohd_state_t *statep) maxgain = w->outamp_cap & AUDIOHDC_AMP_CAP_STEP_NUMS; maxgain >>= AUDIOHD_GAIN_OFF; - if (w->outamp_cap) { - verb = AUDIOHDC_AMP_SET_OUTPUT | - (gain * maxgain / 100); - if (gain == 0) { - /* set mute bit in amplifier */ - verb |= AUDIOHDC_AMP_SET_MUTE; - } - (void) audioha_codec_4bit_verb_get(statep, - path->codec->index, - wid, - AUDIOHDC_VERB_SET_AMP_MUTE, - AUDIOHDC_AMP_SET_LEFT | verb); - (void) audioha_codec_4bit_verb_get(statep, - path->codec->index, - wid, - AUDIOHDC_VERB_SET_AMP_MUTE, - AUDIOHDC_AMP_SET_RIGHT | verb); + verb = AUDIOHDC_AMP_SET_OUTPUT | AUDIOHDC_AMP_SET_INPUT + | (gain * maxgain / 100); + if (gain == 0) { + /* set mute bit in amplifier */ + verb |= AUDIOHDC_AMP_SET_MUTE; } + + (void) audioha_codec_4bit_verb_get(statep, + path->codec->index, wid, AUDIOHDC_VERB_SET_AMP_MUTE, + AUDIOHDC_AMP_SET_LEFT | verb); + (void) audioha_codec_4bit_verb_get(statep, + path->codec->index, wid, AUDIOHDC_VERB_SET_AMP_MUTE, + AUDIOHDC_AMP_SET_RIGHT | verb); } } |