提交 27944403 编写于 作者: H Helen Koike 提交者: Greg Kroah-Hartman

media: vimc: fix component match compare

[ Upstream commit ee1c71a8e1456ab53fe667281d855849edf26a4d ]

If the system has other devices being registered in the component
framework, the compare function will be called with a device that
doesn't belong to vimc.
This device is not necessarily a platform_device, nor have a
platform_data (which causes a NULL pointer dereference error) and if it
does have a pdata, it is not necessarily type of struct vimc_platform_data.
So casting to any of these types is wrong.

Instead of expecting a given pdev with a given pdata, just expect for
the device it self. vimc-core is the one who creates them, we know in
advance exactly which object to expect in the match.

Fixes: 4a29b709 ("[media] vimc: Subdevices as modules")
Signed-off-by: NHelen Koike <helen.koike@collabora.com>
Reviewed-by: NBoris Brezillon <boris.brezillon@collabora.com>
Tested-by: NBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: NHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
上级 a827d6c0
......@@ -243,10 +243,7 @@ static void vimc_comp_unbind(struct device *master)
static int vimc_comp_compare(struct device *comp, void *data)
{
const struct platform_device *pdev = to_platform_device(comp);
const char *name = data;
return !strcmp(pdev->dev.platform_data, name);
return comp == data;
}
static struct component_match *vimc_add_subdevs(struct vimc_device *vimc)
......@@ -276,7 +273,7 @@ static struct component_match *vimc_add_subdevs(struct vimc_device *vimc)
}
component_match_add(&vimc->pdev.dev, &match, vimc_comp_compare,
(void *)vimc->pipe_cfg->ents[i].name);
&vimc->subdevs[i]->dev);
}
return match;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册