aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/vimc/vimc-core.c
diff options
context:
space:
mode:
authorDafna Hirschfeld <[email protected]>2019-10-07 13:49:59 +0000
committerMauro Carvalho Chehab <[email protected]>2019-10-24 21:59:52 +0000
commit817d0b3278f52d4d20b9706e41c808287ee909e4 (patch)
tree86849a42426511ac4d55d70f4d01d225a00fbb8c /drivers/media/platform/vimc/vimc-core.c
parentmedia: imon: invalid dereference in imon_touch_event (diff)
downloadkernel-817d0b3278f52d4d20b9706e41c808287ee909e4.tar.gz
kernel-817d0b3278f52d4d20b9706e41c808287ee909e4.zip
media: vimc: initialize vim entity pointers to NULL
since NULL value for vimc entity pointer indicates that entity creation failed and this is tested, the pointers should be initialized to NULL. Signed-off-by: Dafna Hirschfeld <[email protected]> Acked-by: Helen Koike <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Diffstat (limited to 'drivers/media/platform/vimc/vimc-core.c')
-rw-r--r--drivers/media/platform/vimc/vimc-core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c
index 2d20a7c10398..65048bd7d80b 100644
--- a/drivers/media/platform/vimc/vimc-core.c
+++ b/drivers/media/platform/vimc/vimc-core.c
@@ -199,9 +199,8 @@ static int vimc_register_devices(struct vimc_device *vimc)
}
/* allocate ent_devs */
- vimc->ent_devs = kmalloc_array(vimc->pipe_cfg->num_ents,
- sizeof(*vimc->ent_devs),
- GFP_KERNEL);
+ vimc->ent_devs = kcalloc(vimc->pipe_cfg->num_ents,
+ sizeof(*vimc->ent_devs), GFP_KERNEL);
if (!vimc->ent_devs) {
ret = -ENOMEM;
goto err_v4l2_unregister;