Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27944403 authored by Helen Koike's avatar Helen Koike Committed by Greg Kroah-Hartman
Browse files

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: default avatarHelen Koike <helen.koike@collabora.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Tested-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a827d6c0

drivers/media/platform/vimc/vimc-core.c

+2 −5
Original line number Diff line number Diff line
@@ -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;