aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-blackbird.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/cx88/cx88-blackbird.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/cx88/cx88-blackbird.c')
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index a49062119313..a502a4d6e4ae 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1539,10 +1539,9 @@ static int mpeg_open(struct inode *inode, struct file *file)
1539 dprintk(1,"open minor=%d\n",minor); 1539 dprintk(1,"open minor=%d\n",minor);
1540 1540
1541 /* allocate + initialize per filehandle data */ 1541 /* allocate + initialize per filehandle data */
1542 fh = kmalloc(sizeof(*fh),GFP_KERNEL); 1542 fh = kzalloc(sizeof(*fh),GFP_KERNEL);
1543 if (NULL == fh) 1543 if (NULL == fh)
1544 return -ENOMEM; 1544 return -ENOMEM;
1545 memset(fh,0,sizeof(*fh));
1546 file->private_data = fh; 1545 file->private_data = fh;
1547 fh->dev = dev; 1546 fh->dev = dev;
1548 1547
@@ -1678,10 +1677,9 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
1678 goto fail_core; 1677 goto fail_core;
1679 1678
1680 err = -ENOMEM; 1679 err = -ENOMEM;
1681 dev = kmalloc(sizeof(*dev),GFP_KERNEL); 1680 dev = kzalloc(sizeof(*dev),GFP_KERNEL);
1682 if (NULL == dev) 1681 if (NULL == dev)
1683 goto fail_core; 1682 goto fail_core;
1684 memset(dev,0,sizeof(*dev));
1685 dev->pci = pci_dev; 1683 dev->pci = pci_dev;
1686 dev->core = core; 1684 dev->core = core;
1687 dev->width = 720; 1685 dev->width = 720;