diff options
| author | Sven Barth <pascaldragon@googlemail.com> | 2011-02-13 22:09:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-02 13:45:33 -0300 |
| commit | 1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb (patch) | |
| tree | c91354aa9a829228d1d2b6f4edccd9debd15c59c /drivers/media | |
| parent | 593110d143f85d1aca227685edd571f137388b24 (diff) | |
| download | op-kernel-dev-1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb.zip op-kernel-dev-1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb.tar.gz | |
[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/media')
| -rw-r--r-- | drivers/media/video/cx25840/cx25840-core.c | 3 |
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 6fc09dd..35796e0 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) { |
