Browse Source

V4L/DVB (3090): Cleanup check for dvb.

- Cleanup check for dvb.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Michael Krufky 19 years ago
parent
commit
bcb17c421e
1 changed files with 3 additions and 6 deletions
  1. 3 6
      drivers/media/video/cx88/cx88-i2c.c

+ 3 - 6
drivers/media/video/cx88/cx88-i2c.c

@@ -136,10 +136,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
 	if (0 != core->i2c_rc)
 	if (0 != core->i2c_rc)
 		return;
 		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)
 		if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
 			core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1);
 			core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1);
 
 
@@ -147,8 +144,8 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
 
 
 		if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
 		if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
 			core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0);
 			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 = {
 static struct i2c_algo_bit_data cx8800_i2c_algo_template = {