Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <m3tukc9tiw.fsf@t19.piap.pl>
In-Reply-To: <m3tukc9tiw.fsf@t19.piap.pl>
From:   Tim Harvey <tharvey@gateworks.com>
Date:   Thu, 19 Aug 2021 11:57:32 -0700
Message-ID: <CAJ+vNU1TbEPy8+9XpVwpHXzPDww31qcCyLvKvsxrcBJqu5L+tQ@mail.gmail.com>
Subject: Re: [PATCH v2] TDA1997x: fix tda1997x_remove()
To:     =?UTF-8?Q?Krzysztof_Ha=C5=82asa?= <khalasa@piap.pl>
Cc:     Mauro Carvalho Chehab <mchehab@kernel.org>,
        linux-media <linux-media@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Thu, Jul 29, 2021 at 11:59 PM Krzysztof Ha=C5=82asa <khalasa@piap.pl> wr=
ote:
>
> TDA1997x driver tried to hold two values in a single variable:
> device's "client data" pointer was first set to "sd" in
> v4l2_i2c_subdev_init(), then it was overwritten explicitly
> using dev_set_drvdata() with "state". This caused
> tda1997x_remove() to fail badly.
>
> Signed-off-by: Krzysztof Ha=C5=82asa <khalasa@piap.pl>
>
> diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c
> index 17be95c0dcb3..fb37918b7fb5 100644
> --- a/drivers/media/i2c/tda1997x.c
> +++ b/drivers/media/i2c/tda1997x.c
> @@ -2490,7 +2490,8 @@ static const struct media_entity_operations tda1997=
x_media_ops =3D {
>  static int tda1997x_pcm_startup(struct snd_pcm_substream *substream,
>                                 struct snd_soc_dai *dai)
>  {
> -       struct tda1997x_state *state =3D snd_soc_dai_get_drvdata(dai);
> +       struct v4l2_subdev *sd =3D snd_soc_dai_get_drvdata(dai);
> +       struct tda1997x_state *state =3D to_state(sd);
>         struct snd_soc_component *component =3D dai->component;
>         struct snd_pcm_runtime *rtd =3D substream->runtime;
>         int rate, err;
> @@ -2799,7 +2800,6 @@ static int tda1997x_probe(struct i2c_client *client=
,
>                         dev_err(&client->dev, "register audio codec faile=
d\n");
>                         goto err_free_media;
>                 }
> -               dev_set_drvdata(&state->client->dev, state);
>                 v4l_info(state->client, "registered audio codec\n");
>         }
>
>

Acked-By: Tim Harvey <tharvey@gateworks.com>

Tim