aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran_driver.c
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis@issaris.org>2006-01-11 16:40:56 -0500
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-11 16:40:56 -0500
commit7408187d223f63d46a13b6a35b8f96b032c2f623 (patch)
tree425a459f760295de488f57e3f97b034aaa76a78d /drivers/media/video/zoran_driver.c
parent0b3af1b6df82cfdb54ae294ed860263011fa0408 (diff)
V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)alloc
Conversions from kmalloc+memset to k(z|c)alloc. Signed-off-by: Panagiotis Issaris <takis@issaris.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/zoran_driver.c')
-rw-r--r--drivers/media/video/zoran_driver.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 15283f44e79f..485553be190b 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -1345,7 +1345,7 @@ zoran_open (struct inode *inode,
1345 ZR_DEVNAME(zr), current->comm, current->pid, zr->user); 1345 ZR_DEVNAME(zr), current->comm, current->pid, zr->user);
1346 1346
1347 /* now, create the open()-specific file_ops struct */ 1347 /* now, create the open()-specific file_ops struct */
1348 fh = kmalloc(sizeof(struct zoran_fh), GFP_KERNEL); 1348 fh = kzalloc(sizeof(struct zoran_fh), GFP_KERNEL);
1349 if (!fh) { 1349 if (!fh) {
1350 dprintk(1, 1350 dprintk(1,
1351 KERN_ERR 1351 KERN_ERR
@@ -1354,7 +1354,6 @@ zoran_open (struct inode *inode,
1354 res = -ENOMEM; 1354 res = -ENOMEM;
1355 goto open_unlock_and_return; 1355 goto open_unlock_and_return;
1356 } 1356 }
1357 memset(fh, 0, sizeof(struct zoran_fh));
1358 /* used to be BUZ_MAX_WIDTH/HEIGHT, but that gives overflows 1357 /* used to be BUZ_MAX_WIDTH/HEIGHT, but that gives overflows
1359 * on norm-change! */ 1358 * on norm-change! */
1360 fh->overlay_mask = 1359 fh->overlay_mask =