diff options
Diffstat (limited to 'drivers/staging/media/dt3155v4l/dt3155v4l.c')
-rw-r--r-- | drivers/staging/media/dt3155v4l/dt3155v4l.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c index 2e7b711c8501..479c643da2f6 100644 --- a/drivers/staging/media/dt3155v4l/dt3155v4l.c +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c @@ -396,7 +396,9 @@ dt3155_open(struct file *filp) pd->q->drv_priv = pd; pd->curr_buf = NULL; pd->field_count = 0; - vb2_queue_init(pd->q); /* cannot fail */ + ret = vb2_queue_init(pd->q); + if (ret < 0) + return ret; INIT_LIST_HEAD(&pd->dmaq); spin_lock_init(&pd->lock); /* disable all irqs, clear all irq flags */ @@ -718,7 +720,7 @@ static const struct v4l2_ioctl_ops dt3155_ioctl_ops = { */ }; -static int __devinit +static int dt3155_init_board(struct pci_dev *pdev) { struct dt3155_priv *pd = pci_get_drvdata(pdev); @@ -836,7 +838,7 @@ struct dma_coherent_mem { unsigned long *bitmap; }; -static int __devinit +static int dt3155_alloc_coherent(struct device *dev, size_t size, int flags) { struct dma_coherent_mem *mem; @@ -877,7 +879,7 @@ out: return 0; } -static void __devexit +static void dt3155_free_coherent(struct device *dev) { struct dma_coherent_mem *mem = dev->dma_mem; @@ -891,7 +893,7 @@ dt3155_free_coherent(struct device *dev) kfree(mem); } -static int __devinit +static int dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id) { int err; @@ -956,7 +958,7 @@ err_video_device_alloc: return err; } -static void __devexit +static void dt3155_remove(struct pci_dev *pdev) { struct dt3155_priv *pd = pci_get_drvdata(pdev); @@ -983,7 +985,7 @@ static struct pci_driver pci_driver = { .name = DT3155_NAME, .id_table = pci_ids, .probe = dt3155_probe, - .remove = __devexit_p(dt3155_remove), + .remove = dt3155_remove, }; module_pci_driver(pci_driver); |