commit b22915290844d9db575697311aac46661e1b190c
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 21 13:56:06 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 21 13:56:06 2013 -0800
tree 612feb95f05772f5b3fcd151660dabec14f0e640
parent 4bae69ce3853e1321bc83e28c0cd4ad36ed20bc3
parent cb065748f9d12b74c7849800866d51400e34c45d

Merge "hal: Fix incorrect FM volume after reboot"

hal/audio_extn/fm.c

diff --git a/hal/audio_extn/fm.c b/hal/audio_extn/fm.c
index 53499b9..eeba404 100644
--- a/hal/audio_extn/fm.c
+++ b/hal/audio_extn/fm.c
@@ -50,7 +50,7 @@
     struct pcm *fm_pcm_rx;
     struct pcm *fm_pcm_tx;
     bool is_fm_running;
-    int fm_volume;
+    float fm_volume;
 };
 
 static struct fm_module fmmod = {
@@ -66,7 +66,7 @@
     struct mixer_ctl *ctl;
     const char *mixer_ctl_name = "Internal FM RX Volume";
 
-    ALOGD("%s: entry", __func__);
+    ALOGV("%s: entry", __func__);
     ALOGD("%s: (%f)\n", __func__, value);
 
     if (value < 0.0) {
@@ -77,8 +77,7 @@
         value = 1.0;
     }
     vol  = lrint((value * 0x2000) + 0.5);
-
-    fmmod.fm_volume = vol;
+    fmmod.fm_volume = value;
 
     if (!fmmod.is_fm_running) {
         ALOGV("%s: FM not active, ignoring set_fm_volume call", __func__);
@@ -92,9 +91,9 @@
               __func__, mixer_ctl_name);
         return -EINVAL;
     }
-    mixer_ctl_set_value(ctl, 0, fmmod.fm_volume);
+    mixer_ctl_set_value(ctl, 0, vol);
 
-    ALOGD("%s: exit", __func__);
+    ALOGV("%s: exit", __func__);
     return ret;
 }