diff options
| author | Sven Barth <pascaldragon@googlemail.com> | 2011-02-13 22:09:43 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 14:17:41 -0700 |
| commit | e53b53dd4c61cbdefa897743060d662ac33e1595 (patch) | |
| tree | aa3cfaee1a1a175990116b4296bc890f5d45c026 | |
| parent | c06dc644fc8af9dda13e4e7ed1178e9e9bf02438 (diff) | |
cx25840: fix probing of cx2583x chips
commit 1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb upstream.
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 f16461844c5c..a201d9c57c83 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c @@ -2031,7 +2031,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); cx25840_ir_probe(sd); |