summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSven Barth <pascaldragon@googlemail.com>2011-02-14 02:09:43 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-02 17:45:33 +0100
commit1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb (patch)
treec91354aa9a829228d1d2b6f4edccd9debd15c59c /drivers
parent[media] cx23885: Remove unused 'err:' labels to quiet compiler warning (diff)
downloadlinux-1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb.tar.xz
linux-1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb.zip
[media] cx25840: fix probing of cx2583x chips
Fix the probing of cx2583x chips, because two controls were clustered that are not created for these chips. This regression was introduced in 2.6.36. Signed-off-by: Sven Barth <pascaldragon@googlemail.com> Signed-off-by: Andy Walls <awalls@md.metrocast.net> Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 6fc09dd41b9d..35796e035247 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -2015,7 +2015,8 @@ static int cx25840_probe(struct i2c_client *client,
kfree(state);
return err;
}
- v4l2_ctrl_cluster(2, &state->volume);
+ if (!is_cx2583x(state))
+ v4l2_ctrl_cluster(2, &state->volume);
v4l2_ctrl_handler_setup(&state->hdl);
if (client->dev.platform_data) {