aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-05-28 13:36:28 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:52:21 -0400
commitfabc6b85ca1d364f4e3fdcf80f80b393a508e771 (patch)
treec3063789ef80eb6ac1b5b6249b432318c8e4faaf
parentfcc8e7d8c0e228cf032de0df049a91d5d2bfd0e9 (diff)
[media] media: Convert vmalloc/memset to vzalloc
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/videobuf2-dma-sg.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/videobuf2-dma-sg.c b/drivers/media/video/videobuf2-dma-sg.c
index 10a20d9509d9..065f468faf8f 100644
--- a/drivers/media/video/videobuf2-dma-sg.c
+++ b/drivers/media/video/videobuf2-dma-sg.c
@@ -48,12 +48,10 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size)
48 buf->sg_desc.size = size; 48 buf->sg_desc.size = size;
49 buf->sg_desc.num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; 49 buf->sg_desc.num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
50 50
51 buf->sg_desc.sglist = vmalloc(buf->sg_desc.num_pages * 51 buf->sg_desc.sglist = vzalloc(buf->sg_desc.num_pages *
52 sizeof(*buf->sg_desc.sglist)); 52 sizeof(*buf->sg_desc.sglist));
53 if (!buf->sg_desc.sglist) 53 if (!buf->sg_desc.sglist)
54 goto fail_sglist_alloc; 54 goto fail_sglist_alloc;
55 memset(buf->sg_desc.sglist, 0, buf->sg_desc.num_pages *
56 sizeof(*buf->sg_desc.sglist));
57 sg_init_table(buf->sg_desc.sglist, buf->sg_desc.num_pages); 55 sg_init_table(buf->sg_desc.sglist, buf->sg_desc.num_pages);
58 56
59 buf->pages = kzalloc(buf->sg_desc.num_pages * sizeof(struct page *), 57 buf->pages = kzalloc(buf->sg_desc.num_pages * sizeof(struct page *),
@@ -136,13 +134,11 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
136 last = ((vaddr + size - 1) & PAGE_MASK) >> PAGE_SHIFT; 134 last = ((vaddr + size - 1) & PAGE_MASK) >> PAGE_SHIFT;
137 buf->sg_desc.num_pages = last - first + 1; 135 buf->sg_desc.num_pages = last - first + 1;
138 136
139 buf->sg_desc.sglist = vmalloc( 137 buf->sg_desc.sglist = vzalloc(
140 buf->sg_desc.num_pages * sizeof(*buf->sg_desc.sglist)); 138 buf->sg_desc.num_pages * sizeof(*buf->sg_desc.sglist));
141 if (!buf->sg_desc.sglist) 139 if (!buf->sg_desc.sglist)
142 goto userptr_fail_sglist_alloc; 140 goto userptr_fail_sglist_alloc;
143 141
144 memset(buf->sg_desc.sglist, 0,
145 buf->sg_desc.num_pages * sizeof(*buf->sg_desc.sglist));
146 sg_init_table(buf->sg_desc.sglist, buf->sg_desc.num_pages); 142 sg_init_table(buf->sg_desc.sglist, buf->sg_desc.num_pages);
147 143
148 buf->pages = kzalloc(buf->sg_desc.num_pages * sizeof(struct page *), 144 buf->pages = kzalloc(buf->sg_desc.num_pages * sizeof(struct page *),