diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-11 19:28:02 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-11 19:28:02 +0000 |
| commit | 069637ed9609cb009c57d2bf1039e69812b2304b (patch) | |
| tree | 043bf8adc38ec355490eff08f7bbdfe90a230456 /linux/drivers/media/video/cx88/cx88-video.c | |
| parent | 40aca7dd04e8f2d3e3a8cddd5d3d8c3d596c978f (diff) | |
| download | mediapointer-dvb-s2-069637ed9609cb009c57d2bf1039e69812b2304b.tar.gz mediapointer-dvb-s2-069637ed9609cb009c57d2bf1039e69812b2304b.tar.bz2 | |
From: Panagiotis Issaris <takis@issaris.org>
Conversions from kmalloc+memset to k(z|c)alloc
Conversions from kmalloc+memset to k(z|c)alloc.
kernel-sync
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 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index dcc4c1f61..a31fee5df 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.104 2006/01/01 17:17:39 mchehab Exp $ + * $Id: cx88-video.c,v 1.105 2006/01/11 19:28:02 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -1001,10 +1001,9 @@ static int video_open(struct inode *inode, struct file *file) minor,radio,v4l2_type_names[type]); /* allocate + initialize per filehandle data */ - fh = kmalloc(sizeof(*fh),GFP_KERNEL); + fh = kzalloc(sizeof(*fh),GFP_KERNEL); if (NULL == fh) return -ENOMEM; - memset(fh,0,sizeof(*fh)); file->private_data = fh; fh->dev = dev; fh->radio = radio; @@ -2104,10 +2103,9 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, struct cx88_core *core; int err; - dev = kmalloc(sizeof(*dev),GFP_KERNEL); + dev = kzalloc(sizeof(*dev),GFP_KERNEL); if (NULL == dev) return -ENOMEM; - memset(dev,0,sizeof(*dev)); /* pci init */ dev->pci = pci_dev; |