aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMats Randgaard <mats.randgaard@tandberg.com>2010-08-30 09:30:37 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:05:49 -0400
commit1f8766b4e3f06c2206e7ff48da72d2886672759a (patch)
treed5bf224d4e08f47f3b6fd7232676cbc2f70e3a91 /drivers/media
parentffa1b391c61b9f9a2b5d14859bfdd9259fc6c4da (diff)
V4L/DVB: vpif_cap/disp: Replaced kmalloc with kzalloc
Signed-off-by: Mats Randgaard <mats.randgaard@tandberg.com> Signed-off-by: Hans Verkuil <hans.verkuil@tandberg.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/davinci/vpif_capture.c4
-rw-r--r--drivers/media/video/davinci/vpif_display.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
index 9ba7ace33d4a..2ed233f98a9e 100644
--- a/drivers/media/video/davinci/vpif_capture.c
+++ b/drivers/media/video/davinci/vpif_capture.c
@@ -793,7 +793,7 @@ static int vpif_open(struct file *filep)
793 } 793 }
794 794
795 /* Allocate memory for the file handle object */ 795 /* Allocate memory for the file handle object */
796 fh = kmalloc(sizeof(struct vpif_fh), GFP_KERNEL); 796 fh = kzalloc(sizeof(struct vpif_fh), GFP_KERNEL);
797 if (NULL == fh) { 797 if (NULL == fh) {
798 vpif_err("unable to allocate memory for file handle object\n"); 798 vpif_err("unable to allocate memory for file handle object\n");
799 ret = -ENOMEM; 799 ret = -ENOMEM;
@@ -1995,7 +1995,7 @@ static __init int vpif_probe(struct platform_device *pdev)
1995 config = pdev->dev.platform_data; 1995 config = pdev->dev.platform_data;
1996 1996
1997 subdev_count = config->subdev_count; 1997 subdev_count = config->subdev_count;
1998 vpif_obj.sd = kmalloc(sizeof(struct v4l2_subdev *) * subdev_count, 1998 vpif_obj.sd = kzalloc(sizeof(struct v4l2_subdev *) * subdev_count,
1999 GFP_KERNEL); 1999 GFP_KERNEL);
2000 if (vpif_obj.sd == NULL) { 2000 if (vpif_obj.sd == NULL) {
2001 vpif_err("unable to allocate memory for subdevice pointers\n"); 2001 vpif_err("unable to allocate memory for subdevice pointers\n");
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index a41f188535b3..912c27b75099 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -600,7 +600,7 @@ static int vpif_open(struct file *filep)
600 600
601 ch = video_get_drvdata(vdev); 601 ch = video_get_drvdata(vdev);
602 /* Allocate memory for the file handle object */ 602 /* Allocate memory for the file handle object */
603 fh = kmalloc(sizeof(struct vpif_fh), GFP_KERNEL); 603 fh = kzalloc(sizeof(struct vpif_fh), GFP_KERNEL);
604 if (fh == NULL) { 604 if (fh == NULL) {
605 vpif_err("unable to allocate memory for file handle object\n"); 605 vpif_err("unable to allocate memory for file handle object\n");
606 return -ENOMEM; 606 return -ENOMEM;
@@ -1396,7 +1396,7 @@ static int initialize_vpif(void)
1396 /* Allocate memory for six channel objects */ 1396 /* Allocate memory for six channel objects */
1397 for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) { 1397 for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) {
1398 vpif_obj.dev[i] = 1398 vpif_obj.dev[i] =
1399 kmalloc(sizeof(struct channel_obj), GFP_KERNEL); 1399 kzalloc(sizeof(struct channel_obj), GFP_KERNEL);
1400 /* If memory allocation fails, return error */ 1400 /* If memory allocation fails, return error */
1401 if (!vpif_obj.dev[i]) { 1401 if (!vpif_obj.dev[i]) {
1402 free_channel_objects_index = i; 1402 free_channel_objects_index = i;
@@ -1542,7 +1542,7 @@ static __init int vpif_probe(struct platform_device *pdev)
1542 config = pdev->dev.platform_data; 1542 config = pdev->dev.platform_data;
1543 subdev_count = config->subdev_count; 1543 subdev_count = config->subdev_count;
1544 subdevdata = config->subdevinfo; 1544 subdevdata = config->subdevinfo;
1545 vpif_obj.sd = kmalloc(sizeof(struct v4l2_subdev *) * subdev_count, 1545 vpif_obj.sd = kzalloc(sizeof(struct v4l2_subdev *) * subdev_count,
1546 GFP_KERNEL); 1546 GFP_KERNEL);
1547 if (vpif_obj.sd == NULL) { 1547 if (vpif_obj.sd == NULL) {
1548 vpif_err("unable to allocate memory for subdevice pointers\n"); 1548 vpif_err("unable to allocate memory for subdevice pointers\n");