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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cx18
/
cx18-i2c.c
diff --git
a/drivers/media/video/cx18/cx18-i2c.c
b/drivers/media/video/cx18/cx18-i2c.c
index
d092643
..
b9b7064
100644
(file)
--- a/
drivers/media/video/cx18/cx18-i2c.c
+++ b/
drivers/media/video/cx18/cx18-i2c.c
@@
-100,16
+100,16
@@
int cx18_i2c_register(struct cx18 *cx, unsigned idx)
if (hw == CX18_HW_TUNER) {
/* special tuner group handling */
if (hw == CX18_HW_TUNER) {
/* special tuner group handling */
- sd = v4l2_i2c_new_probed_subdev(
adap, mod, type
,
-
cx->card_i2c->radio);
+ sd = v4l2_i2c_new_probed_subdev(
&cx->v4l2_dev
,
+
adap, mod, type,
cx->card_i2c->radio);
if (sd != NULL)
sd->grp_id = hw;
if (sd != NULL)
sd->grp_id = hw;
- sd = v4l2_i2c_new_probed_subdev(
adap, mod, type
,
-
cx->card_i2c->demod);
+ sd = v4l2_i2c_new_probed_subdev(
&cx->v4l2_dev
,
+
adap, mod, type,
cx->card_i2c->demod);
if (sd != NULL)
sd->grp_id = hw;
if (sd != NULL)
sd->grp_id = hw;
- sd = v4l2_i2c_new_probed_subdev(
adap, mod, type
,
-
cx->card_i2c->tv);
+ sd = v4l2_i2c_new_probed_subdev(
&cx->v4l2_dev
,
+
adap, mod, type,
cx->card_i2c->tv);
if (sd != NULL)
sd->grp_id = hw;
return sd != NULL ? 0 : -1;
if (sd != NULL)
sd->grp_id = hw;
return sd != NULL ? 0 : -1;
@@
-120,7
+120,7
@@
int cx18_i2c_register(struct cx18 *cx, unsigned idx)
return -1;
/* It's an I2C device other than an analog tuner */
return -1;
/* It's an I2C device other than an analog tuner */
- sd = v4l2_i2c_new_subdev(adap, mod, type, hw_addrs[idx]);
+ sd = v4l2_i2c_new_subdev(
&cx->v4l2_dev,
adap, mod, type, hw_addrs[idx]);
if (sd != NULL)
sd->grp_id = hw;
return sd != NULL ? 0 : -1;
if (sd != NULL)
sd->grp_id = hw;
return sd != NULL ? 0 : -1;