diff --git a/[refs] b/[refs] index 6e4e60c8e7b6..e1c18c2b275f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a70c3fbcd546bad2314492700dd8d5c36023eb1 +refs/heads/master: 067d85134a81e2c2a5566d93760e5f398e83a15e diff --git a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c index 2e7b711c8501..54f1813aa1ef 100644 --- a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c +++ b/trunk/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 */