summaryrefslogtreecommitdiffstats
path: root/audio/audio_hw.c
diff options
context:
space:
mode:
authorSimon Wilson <simonwilson@google.com>2011-09-28 15:04:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-28 15:04:38 -0700
commit98e7d2727ea0be66bc6173f9bf088f04cfeb4221 (patch)
tree380da3b7d5a3418186adee04461794a9eb23f267 /audio/audio_hw.c
parentbbd13c9be220bc3430865b70341f6a34f23c21eb (diff)
parent5173fd2d45d055221bdda88e517686f0d471346e (diff)
downloaddevice_samsung_tuna-98e7d2727ea0be66bc6173f9bf088f04cfeb4221.zip
device_samsung_tuna-98e7d2727ea0be66bc6173f9bf088f04cfeb4221.tar.gz
device_samsung_tuna-98e7d2727ea0be66bc6173f9bf088f04cfeb4221.tar.bz2
Merge "Revert "audio: defer ril acoustic call until after modem PCM is open"" into ics-factoryrom
Diffstat (limited to 'audio/audio_hw.c')
-rw-r--r--audio/audio_hw.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 47e3ff7..859b454 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -497,7 +497,6 @@ static void select_input_device(struct tuna_audio_device *adev);
static int adev_set_voice_volume(struct audio_hw_device *dev, float volume);
static int do_input_standby(struct tuna_stream_in *in);
static int do_output_standby(struct tuna_stream_out *out);
-static void set_incall_device(struct tuna_audio_device *adev);
/* Returns true on devices that must use sidetone capture,
* false otherwise. */
@@ -571,8 +570,6 @@ static int start_call(struct tuna_audio_device *adev)
pcm_start(adev->pcm_modem_dl);
pcm_start(adev->pcm_modem_ul);
- set_incall_device(adev);
-
return 0;
err_open_dl:
@@ -851,6 +848,8 @@ static void select_output_device(struct tuna_audio_device *adev)
/* enable sidetone mixer capture if needed */
sidetone_capture_on = earpiece_on && adev->sidetone_capture;
}
+
+ set_incall_device(adev);
}
mixer_ctl_set_value(adev->mixer_ctls.sidetone_capture, 0, sidetone_capture_on);