Merge tag 'v3.8-rc1' into staging/for_v3.9

[sfrench/cifs-2.6.git] / drivers / staging / media / dt3155v4l / dt3155v4l.c

diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 238910373f5c74cdc431725cf1d09bba8c33bd25..e33b7f55d84e2a9aa8232c28463e622b0785c53c 100644 (file)
--- 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 */
@@ -783,7 +785,7 @@ dt3155_init_board(struct pci_dev *pdev)
        }
        write_i2c_reg(pd->regs, CONFIG, pd->config); /*  ACQ_MODE_EVEN  */
 
-       /* select chanel 1 for input and set sync level */
+       /* select channel 1 for input and set sync level */
        write_i2c_reg(pd->regs, AD_ADDR, AD_CMD_REG);
        write_i2c_reg(pd->regs, AD_CMD, VIDEO_CNL_1 | SYNC_CNL_1 | SYNC_LVL_3);