Commit 1e6406b8 authored Feb 13, 2011 by Sven Barth Committed by Mauro Carvalho Chehab Mar 02, 2011

[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>

parent 593110d1

drivers/media/video/cx25840/cx25840-core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2015,6 +2015,7 @@ static int cx25840_probe(struct i2c_client *client,
		kfree(state);
		return err;
		}
		if (!is_cx2583x(state))
		v4l2_ctrl_cluster(2, &state->volume);
		v4l2_ctrl_handler_setup(&state->hdl);