cx25840: fix probing of cx2583x chips

PATCH In review Sven Barth 2 participants 2 messages Feb 5, 2011 Media (V4L/DVB)

lore

Share & tools

lore

Sven Barth

author

2011-02-05 21:53 UTC #0 lore raw

PATCH 1/1 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]>

drivers/media/video/cx25840/cx25840-core.c 2011-02-05 15:58:27.733325238 +0000 renamed from drivers/media/video/cx25840/cx25840-core.c +2 -1

diff -aur linux-2.6.37/drivers/media/video/cx25840/cx25840-core.c linux-2.6.37-patched/drivers/media/video/cx25840/cx25840-core.c
@@ -2031,7 +2031,8 @@
 		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);

Andy Walls

Acked-by on v1 1/1

2011-02-05 23:45 UTC #1 lore raw

Quoted 6 lines · Sven Barth

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

Acked-by Andy Walls <[email protected]>

Quoted 16 lines

diff -aur linux-2.6.37/drivers/media/video/cx25840/cx25840-core.c linux-2.6.37-patched/drivers/media/video/cx25840/cx25840-core.c
--- linux-2.6.37/drivers/media/video/cx25840/cx25840-core.c 2011-01-05
00:50:19.000000000 +0000
+++ linux-2.6.37-patched/drivers/media/video/cx25840/cx25840-core.c
2011-02-05 15:58:27.733325238 +0000
drivers/media/video/cx25840/cx25840-core.c 2011-02-05 15:58:27.733325238 +0000 renamed from drivers/media/video/cx25840/cx25840-core.c +2 -1
@@ -2031,7 +2031,8 @@
  		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);