[PATCH] cx25840: fix probing of cx2583x chips

2011-02-05 Thread 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 pascaldra...@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.0 +
+++ linux-2.6.37-patched/drivers/media/video/cx25840/cx25840-core.c 
2011-02-05 15:58:27.733325238 +

@@ -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);
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] cx25840: fix probing of cx2583x chips

2011-02-05 Thread Andy Walls
On Sat, 2011-02-05 at 22:53 +0100, Sven Barth wrote:
 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 pascaldra...@googlemail.com

Acked-by: Andy Walls awa...@md.metrocast.net


 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.0 +
 +++ linux-2.6.37-patched/drivers/media/video/cx25840/cx25840-core.c 
 2011-02-05 15:58:27.733325238 +
 @@ -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);


--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html