From: Boris Brezillon <boris.brezillon@collabora.com>
To: Helen Koike <helen.koike@collabora.com>
Cc: linux-media@vger.kernel.org, hverkuil-cisco@xs4all.nl,
kernel@collabora.com, ezequiel.garcia@collabora.com,
andrealmeid@collabora.com,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] media: vimc: fix component match compare
Date: Tue, 21 May 2019 14:53:22 +0200 [thread overview]
Message-ID: <20190521145322.5ef21cf7@collabora.com> (raw)
In-Reply-To: <20190517172011.13257-1-helen.koike@collabora.com>
On Fri, 17 May 2019 14:20:11 -0300
Helen Koike <helen.koike@collabora.com> wrote:
> 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 <helen.koike@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
>
> ---
>
> drivers/media/platform/vimc/vimc-core.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c
> index 3aa62d7e3d0e..23992affd01f 100644
> --- a/drivers/media/platform/vimc/vimc-core.c
> +++ b/drivers/media/platform/vimc/vimc-core.c
> @@ -244,10 +244,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)
> @@ -277,7 +274,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;
next prev parent reply other threads:[~2019-05-21 12:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-17 17:20 [PATCH] media: vimc: fix component match compare Helen Koike
2019-05-21 12:53 ` Boris Brezillon [this message]
2019-05-21 12:55 ` Boris Brezillon
2019-05-21 18:39 ` Ezequiel Garcia
2019-05-21 18:53 ` Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190521145322.5ef21cf7@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=andrealmeid@collabora.com \
--cc=ezequiel.garcia@collabora.com \
--cc=helen.koike@collabora.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).