[linux-dvb] Re: [Patch] Adding support for the Hauppage HVR1100

Michael Krufky mkrufky at m1k.net
Fri Dec 2 05:33:58 CET 2005


Johannes Stezenbach wrote:

>On Thu, Dec 01, 2005, Steve Toth wrote:
>  
>
>>>Anyway, enable/disable_plli2c() should then probably be named
>>>i2c_gate_ctrl(..., int enable) or something like that if it
>>>doesn't deal with just plls.
>>> 
>>>      
>>>
>>Done. See attached.
>>
>>[Patch] Adding support for the Hauppauge HVR1100 and HVR1100-LP products
>>
>>Signed-off-by: Steven Toth <stoth at hauppauge.com>
>>    
>>
>
>Looks good.
>Acked-by: Johannes Stezenbach <js at linuxtv.org>
>
>It's up to Mauro or Michael to comment on the cx88 part.
>
>One minor nit:
>
>  
>
>>--- linux/drivers/media/video/cx88/cx88-i2c.c	16 Oct 2005 12:13:58 -0000	1.33
>>+++ linux/drivers/media/video/cx88/cx88-i2c.c	1 Dec 2005 19:54:26 -0000
>>@@ -140,7 +140,20 @@ void cx88_call_i2c_clients(struct cx88_c
>> {
>> 	if (0 != core->i2c_rc)
>> 		return;
>>-	i2c_clients_command(&core->i2c_adap, cmd, arg);
>>+
>>+	if (core->dvbdev == NULL) {
>>+		i2c_clients_command(&core->i2c_adap, cmd, arg);
>>+	} else {
>>    
>>
>
>superflous braces
>
>Johannes
>
Everything else looks good.

Applied as-is ... I fixed the above in a separate patch:

>diff -u -r1.34 -r1.35
>--- v4l-dvb/linux/drivers/media/video/cx88/cx88-i2c.c	2005/12/02 04:16:47	1.34
>+++ v4l-dvb/linux/drivers/media/video/cx88/cx88-i2c.c	2005/12/02 04:22:39	1.35
>@@ -1,5 +1,5 @@
> /*
>-    $Id: cx88-i2c.c,v 1.34 2005/12/02 04:16:47 mkrufky Exp $
>+    $Id: cx88-i2c.c,v 1.35 2005/12/02 04:22:39 mkrufky Exp $
> 
>     cx88-i2c.c  --  all the i2c code is here
> 
>@@ -141,10 +141,7 @@
> 	if (0 != core->i2c_rc)
> 		return;
> 
>-	if (core->dvbdev == NULL) {
>-		i2c_clients_command(&core->i2c_adap, cmd, arg);
>-	} else {
>-
>+	if (core->dvbdev) {
> 		if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
> 			core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1);
> 
>@@ -152,8 +149,8 @@
> 
> 		if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
> 			core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0);
>-	}
>-
>+	} else
>+		i2c_clients_command(&core->i2c_adap, cmd, arg);
> }
> 
> static struct i2c_algo_bit_data cx8800_i2c_algo_template = {
>  
>






More information about the linux-dvb mailing list