diff --git a/[refs] b/[refs] index bdeacc25719e..f8ee1d3733b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0dc6eb9ffcd350453eef91f790e81e042e183cfe +refs/heads/master: eda94710d6502672c5ee7de198fa78a63ddfae3a diff --git a/trunk/drivers/media/usb/pwc/pwc-if.c b/trunk/drivers/media/usb/pwc/pwc-if.c index e191572970c4..5210239cbaee 100644 --- a/trunk/drivers/media/usb/pwc/pwc-if.c +++ b/trunk/drivers/media/usb/pwc/pwc-if.c @@ -1000,7 +1000,11 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id pdev->vb_queue.buf_struct_size = sizeof(struct pwc_frame_buf); pdev->vb_queue.ops = &pwc_vb_queue_ops; pdev->vb_queue.mem_ops = &vb2_vmalloc_memops; - vb2_queue_init(&pdev->vb_queue); + rc = vb2_queue_init(&pdev->vb_queue); + if (rc < 0) { + PWC_ERROR("Oops, could not initialize vb2 queue.\n"); + goto err_free_mem; + } /* Init video_device structure */ memcpy(&pdev->vdev, &pwc_template, sizeof(pwc_template));