mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-11 03:48:00 +00:00
[media] drivers/media: Use vzalloc
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
42e142f6b7
commit
101b25b55e
@ -1536,12 +1536,11 @@ int __devinit ngene_probe(struct pci_dev *pci_dev,
|
||||
if (pci_enable_device(pci_dev) < 0)
|
||||
return -ENODEV;
|
||||
|
||||
dev = vmalloc(sizeof(struct ngene));
|
||||
dev = vzalloc(sizeof(struct ngene));
|
||||
if (dev == NULL) {
|
||||
stat = -ENOMEM;
|
||||
goto fail0;
|
||||
}
|
||||
memset(dev, 0, sizeof(struct ngene));
|
||||
|
||||
dev->pci_dev = pci_dev;
|
||||
dev->card_info = (struct ngene_info *)id->driver_data;
|
||||
|
@ -1186,13 +1186,12 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev)
|
||||
goto egetres;
|
||||
}
|
||||
|
||||
mx3_cam = vmalloc(sizeof(*mx3_cam));
|
||||
mx3_cam = vzalloc(sizeof(*mx3_cam));
|
||||
if (!mx3_cam) {
|
||||
dev_err(&pdev->dev, "Could not allocate mx3 camera object\n");
|
||||
err = -ENOMEM;
|
||||
goto ealloc;
|
||||
}
|
||||
memset(mx3_cam, 0, sizeof(*mx3_cam));
|
||||
|
||||
mx3_cam->clk = clk_get(&pdev->dev, NULL);
|
||||
if (IS_ERR(mx3_cam->clk)) {
|
||||
|
@ -287,14 +287,13 @@ static int pwc_allocate_buffers(struct pwc_device *pdev)
|
||||
/* create frame buffers, and make circular ring */
|
||||
for (i = 0; i < default_fbufs; i++) {
|
||||
if (pdev->fbuf[i].data == NULL) {
|
||||
kbuf = vmalloc(PWC_FRAME_SIZE); /* need vmalloc since frame buffer > 128K */
|
||||
kbuf = vzalloc(PWC_FRAME_SIZE); /* need vmalloc since frame buffer > 128K */
|
||||
if (kbuf == NULL) {
|
||||
PWC_ERROR("Failed to allocate frame buffer %d.\n", i);
|
||||
return -ENOMEM;
|
||||
}
|
||||
PWC_DEBUG_MEMORY("Allocated frame buffer %d at %p.\n", i, kbuf);
|
||||
pdev->fbuf[i].data = kbuf;
|
||||
memset(kbuf, 0, PWC_FRAME_SIZE);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -69,10 +69,9 @@ static struct scatterlist *videobuf_vmalloc_to_sg(unsigned char *virt,
|
||||
struct page *pg;
|
||||
int i;
|
||||
|
||||
sglist = vmalloc(nr_pages * sizeof(*sglist));
|
||||
sglist = vzalloc(nr_pages * sizeof(*sglist));
|
||||
if (NULL == sglist)
|
||||
return NULL;
|
||||
memset(sglist, 0, nr_pages * sizeof(*sglist));
|
||||
sg_init_table(sglist, nr_pages);
|
||||
for (i = 0; i < nr_pages; i++, virt += PAGE_SIZE) {
|
||||
pg = vmalloc_to_page(virt);
|
||||
|
Loading…
x
Reference in New Issue
Block a user