aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa6752hs.c3
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c3
-rw-r--r--drivers/media/video/saa7134/saa7134-video.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index ad73c4a60f2b..0e0ba50946e8 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -511,9 +511,8 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
511 struct saa6752hs_state *h; 511 struct saa6752hs_state *h;
512 512
513 513
514 if (NULL == (h = kmalloc(sizeof(*h), GFP_KERNEL))) 514 if (NULL == (h = kzalloc(sizeof(*h), GFP_KERNEL)))
515 return -ENOMEM; 515 return -ENOMEM;
516 memset(h,0,sizeof(*h));
517 h->client = client_template; 516 h->client = client_template;
518 h->params = param_defaults; 517 h->params = param_defaults;
519 h->client.adapter = adap; 518 h->client.adapter = adap;
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index accbc32725cf..3983a6524cac 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -803,10 +803,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
803 struct saa7134_mpeg_ops *mops; 803 struct saa7134_mpeg_ops *mops;
804 int err; 804 int err;
805 805
806 dev = kmalloc(sizeof(*dev),GFP_KERNEL); 806 dev = kzalloc(sizeof(*dev),GFP_KERNEL);
807 if (NULL == dev) 807 if (NULL == dev)
808 return -ENOMEM; 808 return -ENOMEM;
809 memset(dev,0,sizeof(*dev));
810 809
811 /* pci init */ 810 /* pci init */
812 dev->pci = pci_dev; 811 dev->pci = pci_dev;
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index adfa8fe49a11..e97426bc85df 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1264,10 +1264,9 @@ static int video_open(struct inode *inode, struct file *file)
1264 v4l2_type_names[type]); 1264 v4l2_type_names[type]);
1265 1265
1266 /* allocate + initialize per filehandle data */ 1266 /* allocate + initialize per filehandle data */
1267 fh = kmalloc(sizeof(*fh),GFP_KERNEL); 1267 fh = kzalloc(sizeof(*fh),GFP_KERNEL);
1268 if (NULL == fh) 1268 if (NULL == fh)
1269 return -ENOMEM; 1269 return -ENOMEM;
1270 memset(fh,0,sizeof(*fh));
1271 file->private_data = fh; 1270 file->private_data = fh;
1272 fh->dev = dev; 1271 fh->dev = dev;
1273 fh->radio = radio; 1272 fh->radio = radio;