2 files changed, 5 insertions, 0 deletions

diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 120c498cb60c..e7bf4f4c1319 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -1204,6 +1204,8 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
 
                 switch (qc->id) {
                         case V4L2_CID_AUDIO_VOLUME:
+                                return v4l2_ctrl_query_fill(qc, 0, 65535,
+                                        65535 / 100, state->default_volume);
                         case V4L2_CID_AUDIO_MUTE:
                         case V4L2_CID_AUDIO_BALANCE:
                         case V4L2_CID_AUDIO_BASS:
@@ -1411,6 +1413,8 @@ static int cx25840_probe(struct i2c_client *client,
         state->pvr150_workaround = 0;
         state->audmode = V4L2_TUNER_MODE_LANG1;
         state->unmute_volume = -1;
+        state->default_volume = 228 - cx25840_read(client, 0x8d4);
+        state->default_volume = ((state->default_volume / 2) + 23) << 9;
         state->vbi_line_offset = 8;
         state->id = id;
         state->rev = device_id;
diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h
index 27d8e52cd67e..72916ba975a8 100644
--- a/drivers/media/video/cx25840/cx25840-core.h
+++ b/drivers/media/video/cx25840/cx25840-core.h
@@ -44,6 +44,7 @@ struct cx25840_state {
         u32 audclk_freq;
         int audmode;
         int unmute_volume; /* -1 if not muted */
+        int default_volume;
         int vbi_line_offset;
         u32 id;
         u32 rev;