public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] cx25840: fix probing of cx2583x chips
@ 2011-02-05 21:53 Sven Barth
  2011-02-05 23:45 ` Andy Walls
  0 siblings, 1 reply; 2+ messages in thread
From: Sven Barth @ 2011-02-05 21:53 UTC (permalink / raw)
  To: LMML, Andy Walls

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>

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
@@ -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);

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-02-05 23:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-05 21:53 [PATCH] cx25840: fix probing of cx2583x chips Sven Barth
2011-02-05 23:45 ` Andy Walls

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox