diff options
authorHelen Koike <>2019-05-17 13:20:11 -0400
committerGreg Kroah-Hartman <>2019-12-17 20:39:56 +0100
commit5e3816e76d26696acb298920e0cf9be495a9c99c (patch)
parent7aeb6588a4a777496834787f4f19cae9dcdfecbe (diff)
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: 4a29b7090749 ("[media] vimc: Subdevices as modules") Signed-off-by: Helen Koike <> Reviewed-by: Boris Brezillon <> Tested-by: Boris Brezillon <> Signed-off-by: Hans Verkuil <> Signed-off-by: Mauro Carvalho Chehab <> Signed-off-by: Sasha Levin <>
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c
index 57e5d6a020b0..447a01ff4e23 100644
--- a/drivers/media/platform/vimc/vimc-core.c
+++ b/drivers/media/platform/vimc/vimc-core.c
@@ -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)
@@ -275,7 +272,7 @@ static struct component_match *vimc_add_subdevs(struct vimc_device *vimc)
component_match_add(&vimc->, &match, vimc_comp_compare,
- (void *)vimc->pipe_cfg->ents[i].name);
+ &vimc->subdevs[i]->dev);
return match;