Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
MIME-Version: 1.0
References: <20231028-imx214-v2-0-69a8fb730d6e@apitzsch.eu>
 <20231028-imx214-v2-5-69a8fb730d6e@apitzsch.eu> <CAPybu_1rw8eC=hMXfW1aS-_vJNDnNGTJEL+_k=xK=q5ajz7kRw@mail.gmail.com>
 <72fc57142351331a8a42a6569727b6dd194d419c.camel@apitzsch.eu>
In-Reply-To: <72fc57142351331a8a42a6569727b6dd194d419c.camel@apitzsch.eu>
From:   Ricardo Ribalda Delgado <ribalda@kernel.org>
Date:   Sat, 28 Oct 2023 10:12:56 +0200
Message-ID: <CAPybu_16L0bkjC4qnzCGgqFs45w54bbYeavvJWJqjh3=1AGHVQ@mail.gmail.com>
Subject: Re: [PATCH v2 5/5] media: i2c: imx214: Fix cleanup after controls
 initialization error
To:     =?UTF-8?Q?Andr=C3=A9_Apitzsch?= <git@apitzsch.eu>
Cc:     Sakari Ailus <sakari.ailus@linux.intel.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Kieran Bingham <kieran.bingham@ideasonboard.com>,
        Jacopo Mondi <jacopo.mondi@ideasonboard.com>,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        ~postmarketos/upstreaming@lists.sr.ht
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Andre

On Sat, Oct 28, 2023 at 9:51=E2=80=AFAM Andr=C3=A9 Apitzsch <git@apitzsch.e=
u> wrote:
>
> Hi Ricardo,
>
> Am Samstag, dem 28.10.2023 um 09:30 +0200 schrieb Ricardo Ribalda
> Delgado:
> > Hi Andre
> >
> > On Sat, Oct 28, 2023 at 9:19=E2=80=AFAM Andr=C3=A9 Apitzsch <git@apitzs=
ch.eu>
> > wrote:
> > >
> > > If the controls are initialized incorrectly, don't destroy the
> > > mutex not
> > > initialized yet and don't free controls as that is handled in
> > > imx214_ctrls_init().
> > >
> > > Signed-off-by: Andr=C3=A9 Apitzsch <git@apitzsch.eu>
> >
> > Since you are calling v4l2_ctrl_handler_free() in imx214_ctrls_init,
> > I think you should squash this patch with 2/5.
> >
> > Sorry for asking for a follow-up patch :S
>
> I will squash it. Shall I keep the r-b tags?

That is ok

>
> Is it okay to send the new version now?

Yes please, thanks :)

>
> >
> > Regards!
> >
> >
> > > ---
> > >  drivers/media/i2c/imx214.c | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/media/i2c/imx214.c
> > > b/drivers/media/i2c/imx214.c
> > > index e0d9624a9d3f..0aba28d6dc2f 100644
> > > --- a/drivers/media/i2c/imx214.c
> > > +++ b/drivers/media/i2c/imx214.c
> > > @@ -1069,7 +1069,7 @@ static int imx214_probe(struct i2c_client
> > > *client)
> > >
> > >         ret =3D imx214_ctrls_init(imx214);
> > >         if (ret < 0)
> > > -               goto free_ctrl;
> > > +               goto error_power_off;
> > >
> > >         mutex_init(&imx214->mutex);
> > >         imx214->ctrls.lock =3D &imx214->mutex;
> > > @@ -1100,6 +1100,7 @@ static int imx214_probe(struct i2c_client
> > > *client)
> > >  free_ctrl:
> > >         mutex_destroy(&imx214->mutex);
> > >         v4l2_ctrl_handler_free(&imx214->ctrls);
> > > +error_power_off:
> > >         pm_runtime_disable(imx214->dev);
> > >
> > >         return ret;
> > >
> > > --
> > > 2.42.0
> > >
>