Commit 4b4abbe0 authored by Kangjie Lu's avatar Kangjie Lu Committed by Greg Kroah-Hartman

media: vpss: fix a potential NULL pointer dereference

[ Upstream commit e08f0761 ]

In case ioremap fails, the fix returns -ENOMEM to avoid NULL
pointer dereference.
Signed-off-by: default avatarKangjie Lu <kjlu@umn.edu>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Reviewed-by: default avatarMukesh Ojha <mojha@codeaurora.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c515bd87
...@@ -518,6 +518,11 @@ static int __init vpss_init(void) ...@@ -518,6 +518,11 @@ static int __init vpss_init(void)
return -EBUSY; return -EBUSY;
oper_cfg.vpss_regs_base2 = ioremap(VPSS_CLK_CTRL, 4); oper_cfg.vpss_regs_base2 = ioremap(VPSS_CLK_CTRL, 4);
if (unlikely(!oper_cfg.vpss_regs_base2)) {
release_mem_region(VPSS_CLK_CTRL, 4);
return -ENOMEM;
}
writel(VPSS_CLK_CTRL_VENCCLKEN | writel(VPSS_CLK_CTRL_VENCCLKEN |
VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2); VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment