mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 13:11:45 +00:00
[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>
This commit is contained in:
parent
593110d143
commit
1e6406b8f0
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user