aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/common/saa7146_core.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-07 20:42:33 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:42:42 -0300
commit230b65f9945b468c23188572144b4f066af8f98c (patch)
treea5d7da48908defc6e602a80c932fd06b9f8b7abd /drivers/media/common/saa7146_core.c
parenteae4d69b6a337d29060dcad3a4e19e3e8ace3e70 (diff)
V4L/DVB (10502): saa7146: move v4l2 device registration to saa7146_vv.
Doing the v4l2_device registration in the saa7146 core will make it dependent on v4l2, even for DVB-only boards. This registration and unregistration belongs in saa7146_vv instead. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/saa7146_core.c')
-rw-r--r--drivers/media/common/saa7146_core.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index a123844eb65..982f000a57f 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -363,16 +363,13 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
ERR(("out of memory.\n"));
goto out;
}
- err = v4l2_device_register(&pci->dev, &dev->v4l2_dev);
- if (err)
- goto err_free;
DEB_EE(("pci:%p\n",pci));
err = pci_enable_device(pci);
if (err < 0) {
ERR(("pci_enable_device() failed.\n"));
- goto err_unreg;
+ goto err_free;
}
/* enable bus-mastering */
@@ -480,6 +477,10 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
DEB_D(("ext->attach() failed for %p. skipping device.\n",dev));
goto err_free_i2c;
}
+ /* V4L extensions will set the pci drvdata to the v4l2_device in the
+ attach() above. So for those cards that do not use V4L we have to
+ set it explicitly. */
+ pci_set_drvdata(pci, &dev->v4l2_dev);
INIT_LIST_HEAD(&dev->item);
list_add_tail(&dev->item,&saa7146_devices);
@@ -506,8 +507,6 @@ err_release:
pci_release_region(pci, 0);
err_disable:
pci_disable_device(pci);
-err_unreg:
- v4l2_device_unregister(&dev->v4l2_dev);
err_free:
kfree(dev);
goto out;
@@ -530,7 +529,8 @@ static void saa7146_remove_one(struct pci_dev *pdev)
DEB_EE(("dev:%p\n",dev));
dev->ext->detach(dev);
- v4l2_device_unregister(&dev->v4l2_dev);
+ /* Zero the PCI drvdata after use. */
+ pci_set_drvdata(pdev, NULL);
/* shut down all video dma transfers */
saa7146_write(dev, MC1, 0x00ff0000);