commit: 1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb From: Sven Barth <[email protected]> Date: Sun, 13 Feb 2011 22:09:43 -0300 Subject: [PATCH] [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 <[email protected]> Signed-off-by: Andy Walls <[email protected]> Cc: [email protected] Signed-off-by: Mauro Carvalho Chehab <[email protected]> --- 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) { _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
