[media] media: Convert vmalloc/memset to vzalloc (fabc6b85) · Commits · 戴 / test

drivers/media/video/videobuf2-dma-sg.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -48,12 +48,10 @@ static void vb2_dma_sg_alloc(void alloc_ctx, unsigned long size)
		buf->sg_desc.size = size;
		buf->sg_desc.num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;

		buf->sg_desc.sglist = vmalloc(buf->sg_desc.num_pages *
		buf->sg_desc.sglist = vzalloc(buf->sg_desc.num_pages *
		sizeof(*buf->sg_desc.sglist));
		if (!buf->sg_desc.sglist)
		goto fail_sglist_alloc;
		memset(buf->sg_desc.sglist, 0, buf->sg_desc.num_pages *
		sizeof(*buf->sg_desc.sglist));
		sg_init_table(buf->sg_desc.sglist, buf->sg_desc.num_pages);

		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,
		last = ((vaddr + size - 1) & PAGE_MASK) >> PAGE_SHIFT;
		buf->sg_desc.num_pages = last - first + 1;

		buf->sg_desc.sglist = vmalloc(
		buf->sg_desc.sglist = vzalloc(
		buf->sg_desc.num_pages * sizeof(*buf->sg_desc.sglist));
		if (!buf->sg_desc.sglist)
		goto userptr_fail_sglist_alloc;

		memset(buf->sg_desc.sglist, 0,
		buf->sg_desc.num_pages * sizeof(*buf->sg_desc.sglist));
		sg_init_table(buf->sg_desc.sglist, buf->sg_desc.num_pages);

		buf->pages = kzalloc(buf->sg_desc.num_pages * sizeof(struct page *),