aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-video.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx88/cx88-video.c')
-rw-r--r--drivers/media/video/cx88/cx88-video.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 9a02515fe18b..073494ceab0f 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -750,10 +750,9 @@ static int video_open(struct inode *inode, struct file *file)
750 minor,radio,v4l2_type_names[type]); 750 minor,radio,v4l2_type_names[type]);
751 751
752 /* allocate + initialize per filehandle data */ 752 /* allocate + initialize per filehandle data */
753 fh = kmalloc(sizeof(*fh),GFP_KERNEL); 753 fh = kzalloc(sizeof(*fh),GFP_KERNEL);
754 if (NULL == fh) 754 if (NULL == fh)
755 return -ENOMEM; 755 return -ENOMEM;
756 memset(fh,0,sizeof(*fh));
757 file->private_data = fh; 756 file->private_data = fh;
758 fh->dev = dev; 757 fh->dev = dev;
759 fh->radio = radio; 758 fh->radio = radio;
@@ -1809,10 +1808,9 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
1809 struct cx88_core *core; 1808 struct cx88_core *core;
1810 int err; 1809 int err;
1811 1810
1812 dev = kmalloc(sizeof(*dev),GFP_KERNEL); 1811 dev = kzalloc(sizeof(*dev),GFP_KERNEL);
1813 if (NULL == dev) 1812 if (NULL == dev)
1814 return -ENOMEM; 1813 return -ENOMEM;
1815 memset(dev,0,sizeof(*dev));
1816 1814
1817 /* pci init */ 1815 /* pci init */
1818 dev->pci = pci_dev; 1816 dev->pci = pci_dev;