diff options
author | Keith Deacon | 2012-09-27 09:16:27 -0500 |
---|---|---|
committer | Keith Deacon | 2012-09-27 09:16:27 -0500 |
commit | 977eeecf873286f809f8d0a2ee5513920d417127 (patch) | |
tree | 02d84ad8cbebb35b1340b6614731b3b637a6e5e9 | |
parent | 6ad89cb3f5c50e9a75dc63590f8c2c72cc773c1b (diff) | |
parent | 889493b5e02b6638c3ac3fe97b8617cfaa37db88 (diff) | |
download | device-ti-common-open-977eeecf873286f809f8d0a2ee5513920d417127.tar.gz device-ti-common-open-977eeecf873286f809f8d0a2ee5513920d417127.tar.xz device-ti-common-open-977eeecf873286f809f8d0a2ee5513920d417127.zip |
Merge jb-release into d-jb-release
-rw-r--r-- | audio/audio_hw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 2680475..4d9a614 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c | |||
@@ -1396,9 +1396,10 @@ static void select_output_device(struct omap_audio_device *adev) | |||
1396 | * during call before switch changes. | 1396 | * during call before switch changes. |
1397 | */ | 1397 | */ |
1398 | if (adev->mode == AUDIO_MODE_IN_CALL) { | 1398 | if (adev->mode == AUDIO_MODE_IN_CALL) { |
1399 | /* no sidetone while re-routing uplink path to avoid | 1399 | /* no sidetone while re-routing uplink path to avoid propagating |
1400 | propagating pops/glitches to downlink */ | 1400 | pops/glitches to downlink, and disable modem acoustics */ |
1401 | mixer_ctl_set_value(adev->mixer_ctls.sidetone_capture, 0, 0); | 1401 | mixer_ctl_set_value(adev->mixer_ctls.sidetone_capture, 0, 0); |
1402 | ril_set_call_audio_path(&adev->ril, SOUND_AUDIO_PATH_NO_ACOUSTICS); | ||
1402 | 1403 | ||
1403 | for (channel = 0; channel < 2; channel++) | 1404 | for (channel = 0; channel < 2; channel++) |
1404 | voice_ul_volume[channel] = | 1405 | voice_ul_volume[channel] = |