diff options
author | Steven Toth <stoth@kernellabs.com> | 2012-01-04 08:47:57 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-04 17:47:11 -0500 |
commit | 4c3764d15050f91a76cede6f24402cd2701e73ef (patch) | |
tree | 696a18baf12601a03f9555c1c6b8f7eeb0c1debe /drivers/media/video/cx23885 | |
parent | c81c0060acff726dc582185da303b3057d780af7 (diff) |
[media] cx25840 / cx23885: Fixing audio/volume regression
Since the conversion to subdev in Oct 2010 the audio controls have
not functioned correctly in the cx23885 driver. Passing values of
0-3f did not translate into meaningfull register writes. I've
converted the cx23885 driver to match the cx25840 volume control
definition and now audio is working reliably again.
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 7415524e8777..7f3b973081a0 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c | |||
@@ -253,9 +253,9 @@ static struct cx23885_ctrl cx23885_ctls[] = { | |||
253 | .id = V4L2_CID_AUDIO_VOLUME, | 253 | .id = V4L2_CID_AUDIO_VOLUME, |
254 | .name = "Volume", | 254 | .name = "Volume", |
255 | .minimum = 0, | 255 | .minimum = 0, |
256 | .maximum = 0x3f, | 256 | .maximum = 65535, |
257 | .step = 1, | 257 | .step = 65535 / 100, |
258 | .default_value = 0x3f, | 258 | .default_value = 65535, |
259 | .type = V4L2_CTRL_TYPE_INTEGER, | 259 | .type = V4L2_CTRL_TYPE_INTEGER, |
260 | }, | 260 | }, |
261 | .reg = PATH1_VOL_CTL, | 261 | .reg = PATH1_VOL_CTL, |