[media] vb2: only check ret if we assigned it

[sfrench/cifs-2.6.git] / drivers / media / v4l2-core / videobuf2-core.c

diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 7c1d390ea438409d8599dc1b3974b704a83208d4..94afbbf928072ba6c24c850bdc41c3ab0820a96d 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -984,11 +984,12 @@ static int __qbuf_userptr(struct vb2_buffer *vb, const void *pb)
 
        memset(planes, 0, sizeof(planes[0]) * vb->num_planes);
        /* Copy relevant information provided by the userspace */
-       if (pb)
+       if (pb) {
                ret = call_bufop(vb->vb2_queue, fill_vb2_buffer,
                                 vb, pb, planes);
-       if (ret)
-               return ret;
+               if (ret)
+                       return ret;
+       }
 
        for (plane = 0; plane < vb->num_planes; ++plane) {
                /* Skip the plane if already verified */
@@ -1101,11 +1102,12 @@ static int __qbuf_dmabuf(struct vb2_buffer *vb, const void *pb)
 
        memset(planes, 0, sizeof(planes[0]) * vb->num_planes);
        /* Copy relevant information provided by the userspace */
-       if (pb)
+       if (pb) {
                ret = call_bufop(vb->vb2_queue, fill_vb2_buffer,
                                 vb, pb, planes);
-       if (ret)
-               return ret;
+               if (ret)
+                       return ret;
+       }
 
        for (plane = 0; plane < vb->num_planes; ++plane) {
                struct dma_buf *dbuf = dma_buf_get(planes[plane].m.fd);