summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNavya Sri Nizamkari2015-03-10 13:05:57 +0100
committerGreg Kroah-Hartman2015-03-15 18:41:09 +0100
commit9ac04a878802a121caef6cc924931281b7091f03 (patch)
tree3948267cd63d2cdd2f304f2ada594cec8aee1ef5
parentstaging: media: Use kcalloc instead of kzalloc (diff)
downloadkernel-qcow2-linux-9ac04a878802a121caef6cc924931281b7091f03.tar.gz
kernel-qcow2-linux-9ac04a878802a121caef6cc924931281b7091f03.tar.xz
kernel-qcow2-linux-9ac04a878802a121caef6cc924931281b7091f03.zip
staging: media: Use kcalloc instead of kzalloc.
This patch uses kcalloc instead of kzalloc function. A coccinelle script was used to make this change. Signed-off-by: Navya Sri Nizamkari <navyasri.tech@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
index a350a20955f1..57426199ad7a 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
@@ -226,8 +226,8 @@ static int vpfe_enable_clock(struct vpfe_device *vpfe_dev)
if (!vpfe_cfg->num_clocks)
return 0;
- vpfe_dev->clks = kzalloc(vpfe_cfg->num_clocks *
- sizeof(struct clock *), GFP_KERNEL);
+ vpfe_dev->clks = kcalloc(vpfe_cfg->num_clocks,
+ sizeof(struct clock *), GFP_KERNEL);
if (vpfe_dev->clks == NULL)
return -ENOMEM;
@@ -346,7 +346,8 @@ static int register_i2c_devices(struct vpfe_device *vpfe_dev)
i2c_adap = i2c_get_adapter(1);
num_subdevs = vpfe_cfg->num_subdevs;
vpfe_dev->sd =
- kzalloc(sizeof(struct v4l2_subdev *)*num_subdevs, GFP_KERNEL);
+ kcalloc(num_subdevs, sizeof(struct v4l2_subdev *),
+ GFP_KERNEL);
if (vpfe_dev->sd == NULL)
return -ENOMEM;