summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffy Chen <jeffy.chen@rock-chips.com>2016-01-25 18:36:39 +0800
committerLeo Wang <leozwang@google.com>2016-03-15 03:47:20 +0000
commitbb90a00f12b3fc192544abb1fdd3bffede7e122a (patch)
treeae8bd71ed7ceec0cd539aef961fa5e614d6e1ba3
parentb523f437c66adbb87275fae2ab78d257188b5590 (diff)
downloadrockchip-bb90a00f12b3fc192544abb1fdd3bffede7e122a.tar.gz
kylin: audio: fix volume could not adjust error
Depends on realtek's kernel driver CL. Bug: 26807594 Change-Id: I95c4b5fb216d64b6d7f0b4eabd890a98abedeee0 Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
-rw-r--r--peripheral/audio/generic/audio_hal.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/peripheral/audio/generic/audio_hal.c b/peripheral/audio/generic/audio_hal.c
index fcee516..215f14e 100644
--- a/peripheral/audio/generic/audio_hal.c
+++ b/peripheral/audio/generic/audio_hal.c
@@ -1233,13 +1233,18 @@ static int adev_open(const hw_module_t* module, const char* name, hw_device_t**
/* setting master volume to value 50 */
adev->master_volume = 50;
- int ret = 0;
ctl = mixer_get_ctl_by_name(mixer, "HP Playback Switch");
- ret = mixer_ctl_set_value(ctl,0,1);
- ret = mixer_ctl_set_value(ctl,1,1);
+ mixer_ctl_set_value(ctl,0,1);
+ mixer_ctl_set_value(ctl,1,1);
+ ctl = mixer_get_ctl_by_name(mixer, "HP Channel Switch");
+ mixer_ctl_set_value(ctl,0,1);
+ mixer_ctl_set_value(ctl,1,1);
ctl = mixer_get_ctl_by_name(mixer, "HP Playback Volume");
mixer_ctl_set_value(ctl,0,adjust_volume(adev->master_volume));
mixer_ctl_set_value(ctl,1,adjust_volume(adev->master_volume));
+ ctl = mixer_get_ctl_by_name(mixer, "HPO MIX HPVOL Switch");
+ mixer_ctl_set_value(ctl,0,1);
+ mixer_ctl_set_value(ctl,1,1);
ctl = mixer_get_ctl_by_name(mixer, "HPO MIX DAC1 Switch");
mixer_ctl_set_value(ctl,0,1);
ctl = mixer_get_ctl_by_name(mixer, "HPO MIX DAC1 Switch");