summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-12-02 04:22:39 +0000
committerMichael Krufky <devnull@localhost>2005-12-02 04:22:39 +0000
commit4e8b4c7b6886d45ac40d9fb4d1eec9a883a30693 (patch)
treedb236c051ca4fd89ef9a093eefac2c5d9b78485f /linux/drivers
parenteb9557684562f451a266dcdfe010c4184107a6bd (diff)
downloadmediapointer-dvb-s2-4e8b4c7b6886d45ac40d9fb4d1eec9a883a30693.tar.gz
mediapointer-dvb-s2-4e8b4c7b6886d45ac40d9fb4d1eec9a883a30693.tar.bz2
Cleanup check for dvb.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/cx88/cx88-i2c.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c
index 2fff54e1a..c566bed34 100644
--- a/linux/drivers/media/video/cx88/cx88-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c
@@ -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 @@ 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);
@@ -152,8 +149,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 = {