Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 13:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] cx25840: fix probing of cx2583x chips

Browse Source 
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>
This commit is contained in:
Sven Barth 2011-02-13 22:09:43 -03:00 committed by Mauro Carvalho Chehab
parent 593110d143
commit 1e6406b8f0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/cx25840/cx25840-core.c
View File

@ -2015,7 +2015,8 @@ static int cx25840_probe(struct i2c_client *client,
kfree(state); kfree(state);
return err; return err;
} }
v4l2_ctrl_cluster(2, &state->volume); if (!is_cx2583x(state))
v4l2_ctrl_cluster(2, &state->volume);
v4l2_ctrl_handler_setup(&state->hdl); v4l2_ctrl_handler_setup(&state->hdl);
if (client->dev.platform_data) { if (client->dev.platform_data) {