提交 9212a572 编写于 作者: D Darron Broad 提交者: Mauro Carvalho Chehab

V4L/DVB (9332): cx88: initial fix for analogue only compilation

Initial fix for when analogue only is selected
for compilation (ie, !CX88_DVB)
Signed-off-by: NDarron Broad <darron@kewl.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 8a522c91
...@@ -116,8 +116,10 @@ static int detach_inform(struct i2c_client *client) ...@@ -116,8 +116,10 @@ static int detach_inform(struct i2c_client *client)
void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg) void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
{ {
#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
struct videobuf_dvb_frontends *f = &core->dvbdev->frontends; struct videobuf_dvb_frontends *f = &core->dvbdev->frontends;
struct videobuf_dvb_frontend *fe = NULL; struct videobuf_dvb_frontend *fe = NULL;
#endif
if (0 != core->i2c_rc) if (0 != core->i2c_rc)
return; return;
......
...@@ -768,8 +768,11 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev, ...@@ -768,8 +768,11 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
{ {
struct cx8802_dev *dev; struct cx8802_dev *dev;
struct cx88_core *core; struct cx88_core *core;
int err;
#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
struct videobuf_dvb_frontend *demod; struct videobuf_dvb_frontend *demod;
int err,i; int i;
#endif
/* general setup */ /* general setup */
core = cx88_core_get(pci_dev); core = cx88_core_get(pci_dev);
...@@ -801,6 +804,7 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev, ...@@ -801,6 +804,7 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
INIT_LIST_HEAD(&dev->drvlist); INIT_LIST_HEAD(&dev->drvlist);
list_add_tail(&dev->devlist,&cx8802_devlist); list_add_tail(&dev->devlist,&cx8802_devlist);
#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
mutex_init(&dev->frontends.lock); mutex_init(&dev->frontends.lock);
INIT_LIST_HEAD(&dev->frontends.felist); INIT_LIST_HEAD(&dev->frontends.felist);
...@@ -814,6 +818,7 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev, ...@@ -814,6 +818,7 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
goto fail_free; goto fail_free;
} }
} }
#endif
/* Maintain a reference so cx88-video can query the 8802 device. */ /* Maintain a reference so cx88-video can query the 8802 device. */
core->dvbdev = dev; core->dvbdev = dev;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册