diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-18 12:21:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-18 12:21:25 -0300 |
| commit | 6802e30de304059d908100b6874f246c45c47792 (patch) | |
| tree | 357f49ba2ac92fe05facd95981bf51888e2afe8d /linux/drivers/media/video/cx88/cx88-cards.c | |
| parent | 53c5d79124323a6862c2ec0f3c73edba4f35eb89 (diff) | |
| parent | 976a91082e499203f3700aa589a54aefedc3c22a (diff) | |
| download | mediapointer-dvb-s2-6802e30de304059d908100b6874f246c45c47792.tar.gz mediapointer-dvb-s2-6802e30de304059d908100b6874f246c45c47792.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-cards.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index b3d966ad5..719315d02 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -3171,7 +3171,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; } |