diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-14 12:40:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 12:43:23 -0300 |
| commit | 9467fe126451c7fc7878d21f3cd1938421ef972e (patch) | |
| tree | 298d0aebb8328829a4b41729e817ccc1fff9c298 /drivers/media/video/cx88/cx88-cards.c | |
| parent | 74fc7bd9cec0ccdbea23659208492ec7ffc58297 (diff) | |
| download | op-kernel-dev-9467fe126451c7fc7878d21f3cd1938421ef972e.zip op-kernel-dev-9467fe126451c7fc7878d21f3cd1938421ef972e.tar.gz | |
V4L/DVB (11047): cx88: convert to v4l2_device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88/cx88-cards.c')
| -rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 1d7e3a56..b9def8c 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c @@ -3138,7 +3138,15 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr) core->nr = nr; sprintf(core->name, "cx88[%d]", core->nr); + + strcpy(core->v4l2_dev.name, core->name); + if (v4l2_device_register(NULL, &core->v4l2_dev)) { + kfree(core); + return NULL; + } + if (0 != cx88_get_resources(core, pci)) { + v4l2_device_unregister(&core->v4l2_dev); kfree(core); return NULL; } |
