diff options
| author | Simon Wilson <simonwilson@google.com> | 2012-10-26 10:02:12 -0700 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2012-10-26 10:02:12 -0700 |
| commit | 19edf859ed029371114c37151efa551e3bac08ae (patch) | |
| tree | 8d112ce05da1d0c9e3bc286106774b766aaee24d /audio | |
| parent | 85613536e26a2351ae3d9f36b5f34b20d38e0de0 (diff) | |
Revert "Audio: fix incorrect routing path."
This reverts commit bc5583c5f01457d36a06cfc72095cf85b2a6dea9.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index dd8769d..7018e6a 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -191,12 +191,10 @@ static void select_devices(struct audio_device *adev) reset_mixer_state(adev->ar); - if (speaker_on) { - if(is_dock_in()) - audio_route_apply_path(adev->ar, "dock"); - else + if (speaker_on && !is_dock_in()) audio_route_apply_path(adev->ar, "speaker"); - } + else + audio_route_apply_path(adev->ar, "dock"); if (headphone_on) audio_route_apply_path(adev->ar, "headphone"); if (main_mic_on) { |