git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-i2c.c
diff --git
a/drivers/media/video/cx88/cx88-i2c.c
b/drivers/media/video/cx88/cx88-i2c.c
index
f720901
..
7bea347
100644
(file)
--- a/
drivers/media/video/cx88/cx88-i2c.c
+++ b/
drivers/media/video/cx88/cx88-i2c.c
@@
-138,13
+138,13
@@
void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
return;
if (core->dvbdev) {
return;
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);
+ 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);
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);
+ 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);
}
} else
i2c_clients_command(&core->i2c_adap, cmd, arg);
}
@@
-155,7
+155,6
@@
static struct i2c_algo_bit_data cx8800_i2c_algo_template = {
.getsda = cx8800_bit_getsda,
.getscl = cx8800_bit_getscl,
.udelay = 16,
.getsda = cx8800_bit_getsda,
.getscl = cx8800_bit_getscl,
.udelay = 16,
- .mdelay = 10,
.timeout = 200,
};
.timeout = 200,
};
@@
-234,7
+233,6
@@
int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
/* ----------------------------------------------------------------------- */
EXPORT_SYMBOL(cx88_call_i2c_clients);
/* ----------------------------------------------------------------------- */
EXPORT_SYMBOL(cx88_call_i2c_clients);
-EXPORT_SYMBOL(cx88_i2c_init);
/*
* Local variables:
/*
* Local variables: