---

yaml --- r: 17288 b: refs/heads/master c: bcb17c4 h: refs/heads/master v: v3
git-mirror · Jan 9, 2006 · 357aabd · 357aabd
1 parent e95e48b
commit 357aabd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 611900c1858747a87657eb405ebab5b1e72bb57c
+refs/heads/master: bcb17c421e8fa20d31a0b4a60686908b6d469ce7
diff --git a/trunk/drivers/media/video/cx88/cx88-i2c.c b/trunk/drivers/media/video/cx88/cx88-i2c.c
@@ -136,19 +136,16 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
 	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);
 
 		i2c_clients_command(&core->i2c_adap, cmd, arg);
 
 		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 = {