diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-14 16:40:51 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-14 16:40:51 +0100 |
| commit | 98067ab29acca0eafb57f28d72ae299eb41d6642 (patch) | |
| tree | 399ed89c5e05ce87b92667178985135195129cc0 /linux/drivers/media/video/cx88/cx88-core.c | |
| parent | c5b41e23cfa080a22b48bdf0e6e2a8028f340a70 (diff) | |
| download | mediapointer-dvb-s2-98067ab29acca0eafb57f28d72ae299eb41d6642.tar.gz mediapointer-dvb-s2-98067ab29acca0eafb57f28d72ae299eb41d6642.tar.bz2 | |
cx88: convert to v4l2_device.
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index c9de13b56..ca36a48fa 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1040,7 +1040,8 @@ struct video_device *cx88_vdev_init(struct cx88_core *core, return NULL; *vfd = *template; vfd->minor = -1; - vfd->parent = &pci->dev; + vfd->v4l2_dev = &core->v4l2_dev; + vfd->parent = &pci->dev; vfd->release = video_device_release; snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", core->name, type, core->board.name); @@ -1093,6 +1094,7 @@ void cx88_core_put(struct cx88_core *core, struct pci_dev *pci) iounmap(core->lmmio); cx88_devcount--; mutex_unlock(&devlist); + v4l2_device_unregister(&core->v4l2_dev); kfree(core); } |