summaryrefslogtreecommitdiff
path: root/drivers/media/video/cx88/cx88-i2c.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@m1k.net>2006-01-09 15:25:13 -0200
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-09 15:25:13 -0200
commitbcb17c421e8fa20d31a0b4a60686908b6d469ce7 (patch)
tree1d405e8fc9393e44055e1f825ed175cc83b314c0 /drivers/media/video/cx88/cx88-i2c.c
parent611900c1858747a87657eb405ebab5b1e72bb57c (diff)
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>
Diffstat (limited to 'drivers/media/video/cx88/cx88-i2c.c')
-rw-r--r--drivers/media/video/cx88/cx88-i2c.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 7363dd6e66e2..c6492089ee1a 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/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)
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);
@@ -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)
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 = {