Home » Mailing list archives » linux-kernel » 2010 » December » 31

[PATCH 14/18] cx25840: Fix subdev registration in cx25840-core.c

Previous thread: [PATCH 13/18] stv0367: coding style corrections by Igor M. Liplianin on Friday, December 31, 2010 - 4:37 am. (1 message)

Next thread: [PATCH 14/18] cx25840: Fix subdev registration in cx25840-core.c by Igor M. Liplianin on Friday, December 31, 2010 - 4:37 am. (1 message)
[view original message]
From: Igor M. Liplianin
Subject: [PATCH 14/18] cx25840: Fix subdev registration in cx25840-core.c
Date: Friday, December 31, 2010 - 4:37 am

On my system, cx23885 based card reports default volume value above 70000.
So, register cx25840 subdev fails. Although, the card don't have a/v inputs
it needs a/v firmware to be loaded.

Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
---
 drivers/media/video/cx25840/cx25840-core.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index dfb198d..dc0cec7 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -1991,6 +1991,8 @@ static int cx25840_probe(struct i2c_client *client,
 	if (!is_cx2583x(state)) {
 		default_volume = 228 - cx25840_read(client, 0x8d4);
 		default_volume = ((default_volume / 2) + 23) << 9;
+		if (default_volume > 65535)
+			default_volume = 65535;
 
 		state->volume = v4l2_ctrl_new_std(&state->hdl,
 			&cx25840_audio_ctrl_ops, V4L2_CID_AUDIO_VOLUME,
-- 
1.7.1

--


[ message continues ]
Previous thread: [PATCH 13/18] stv0367: coding style corrections by Igor M. Liplianin on Friday, December 31, 2010 - 4:37 am. (1 message)

Next thread: [PATCH 14/18] cx25840: Fix subdev registration in cx25840-core.c by Igor M. Liplianin on Friday, December 31, 2010 - 4:37 am. (1 message)