diff options
| author | Sven Barth <pascaldragon@googlemail.com> | 2011-02-13 20:09:43 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-02 11:45:33 -0500 |
| commit | 1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb (patch) | |
| tree | c91354aa9a829228d1d2b6f4edccd9debd15c59c | |
| parent | 593110d143f85d1aca227685edd571f137388b24 (diff) | |
[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>
| -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 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, | |||
| 2015 | kfree(state); | 2015 | kfree(state); |
| 2016 | return err; | 2016 | return err; |
| 2017 | } | 2017 | } |
| 2018 | v4l2_ctrl_cluster(2, &state->volume); | 2018 | if (!is_cx2583x(state)) |
| 2019 | v4l2_ctrl_cluster(2, &state->volume); | ||
| 2019 | v4l2_ctrl_handler_setup(&state->hdl); | 2020 | v4l2_ctrl_handler_setup(&state->hdl); |
| 2020 | 2021 | ||
| 2021 | if (client->dev.platform_data) { | 2022 | if (client->dev.platform_data) { |