Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / drivers / media / v4l2-core / videobuf2-vmalloc.c

diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
index c2820a6e164dec114a6a062c071da7414428bf95..ab3227b75c8486d0471bd603140e8cca88ce81b4 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
@@ -41,7 +41,7 @@ static void *vb2_vmalloc_alloc(struct device *dev, unsigned long attrs,
 
        buf = kzalloc(sizeof(*buf), GFP_KERNEL | gfp_flags);
        if (!buf)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        buf->size = size;
        buf->vaddr = vmalloc_user(buf->size);
@@ -53,7 +53,7 @@ static void *vb2_vmalloc_alloc(struct device *dev, unsigned long attrs,
        if (!buf->vaddr) {
                pr_debug("vmalloc of size %ld failed\n", buf->size);
                kfree(buf);
-               return NULL;
+               return ERR_PTR(-ENOMEM);
        }
 
        atomic_inc(&buf->refcount);
@@ -77,17 +77,20 @@ static void *vb2_vmalloc_get_userptr(struct device *dev, unsigned long vaddr,
        struct vb2_vmalloc_buf *buf;
        struct frame_vector *vec;
        int n_pages, offset, i;
+       int ret = -ENOMEM;
 
        buf = kzalloc(sizeof(*buf), GFP_KERNEL);
        if (!buf)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        buf->dma_dir = dma_dir;
        offset = vaddr & ~PAGE_MASK;
        buf->size = size;
        vec = vb2_create_framevec(vaddr, size, dma_dir == DMA_FROM_DEVICE);
-       if (IS_ERR(vec))
+       if (IS_ERR(vec)) {
+               ret = PTR_ERR(vec);
                goto fail_pfnvec_create;
+       }
        buf->vec = vec;
        n_pages = frame_vector_count(vec);
        if (frame_vector_to_pages(vec) < 0) {
@@ -117,7 +120,7 @@ fail_map:
 fail_pfnvec_create:
        kfree(buf);
 
-       return NULL;
+       return ERR_PTR(ret);
 }
 
 static void vb2_vmalloc_put_userptr(void *buf_priv)