Message ID | 1347889658-15116-1-git-send-email-elezegarcia@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi, Thanks I've added this to my media tree and it will be included in my next pull-req to Mauro. Regards, Hans On 09/17/2012 03:47 PM, elezegarcia@gmail.com wrote: > From: Ezequiel Garcia <elezegarcia@gmail.com> > > This function returns an integer and it's mandatory > to check the return code. > > Cc: Hans de Goede <hdegoede@redhat.com> > Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> > --- > drivers/media/usb/pwc/pwc-if.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c > index 42e36ba..31d082e 100644 > --- a/drivers/media/usb/pwc/pwc-if.c > +++ b/drivers/media/usb/pwc/pwc-if.c > @@ -1000,7 +1000,9 @@ 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) > + goto err_free_mem; > > /* Init video_device structure */ > memcpy(&pdev->vdev, &pwc_template, sizeof(pwc_template)); > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index 42e36ba..31d082e 100644 --- a/drivers/media/usb/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c @@ -1000,7 +1000,9 @@ 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) + goto err_free_mem; /* Init video_device structure */ memcpy(&pdev->vdev, &pwc_template, sizeof(pwc_template));