diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-27 14:26:25 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-14 10:48:01 -0800 |
| commit | 0dc2f4dcf99e372f49538e6c9949891d08d3091d (patch) | |
| tree | 55bf360a08c58fbf5ddba0aead6782ee9023f544 | |
| parent | 6d468d117d8853f9235480cf6329b99868290b23 (diff) | |
| download | lwn-0dc2f4dcf99e372f49538e6c9949891d08d3091d.tar.gz lwn-0dc2f4dcf99e372f49538e6c9949891d08d3091d.zip | |
media: pwc-if: must check vb2_queue_init() success
commit eda94710d6502672c5ee7de198fa78a63ddfae3a upstream.
drivers/media/usb/pwc/pwc-if.c: In function 'usb_pwc_probe':
drivers/media/usb/pwc/pwc-if.c:1003:16: warning: ignoring return value of 'vb2_queue_init', declared with attribute warn_unused_result [-Wunused-result]
In the past, it used to have a logic there at queue init that would
BUG() on errors. This logic got removed. Drivers are now required
to explicitly handle the queue initialization errors, or very bad
things may happen.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
| -rw-r--r-- | drivers/media/usb/pwc/pwc-if.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index 42e36bac4d72..4d12397047aa 100644 --- a/drivers/media/usb/pwc/pwc-if.c +++ b/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)); |