| Message ID | 20210915015013.3169934-2-niklas.soderlund+renesas@ragnatech.se |
|---|---|
| State | Accepted |
| Commit | 984166720eb42e59c0c651f161c291b32dc360fc |
| Headers | show |
| Series | [v2,1/2] media: rcar-csi2: Cleanup mutex on remove and fail | expand |
On 15/09/2021 02:50, Niklas Söderlund wrote: > The mutex was not destroyed on remove or failed probe, fix this. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > --- > drivers/media/platform/rcar-vin/rcar-csi2.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c > index e28eff0396888f2d..a02573dbd5da4f62 100644 > --- a/drivers/media/platform/rcar-vin/rcar-csi2.c > +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c > @@ -1245,14 +1245,14 @@ static int rcsi2_probe(struct platform_device *pdev) > ret = rcsi2_probe_resources(priv, pdev); > if (ret) { > dev_err(priv->dev, "Failed to get resources\n"); > - return ret; > + goto error_mutex; > } > > platform_set_drvdata(pdev, priv); > > ret = rcsi2_parse_dt(priv); > if (ret) > - return ret; > + goto error_mutex; > > priv->subdev.owner = THIS_MODULE; > priv->subdev.dev = &pdev->dev; > @@ -1272,21 +1272,23 @@ static int rcsi2_probe(struct platform_device *pdev) > ret = media_entity_pads_init(&priv->subdev.entity, NR_OF_RCAR_CSI2_PAD, > priv->pads); > if (ret) > - goto error; > + goto error_async; > > pm_runtime_enable(&pdev->dev); > > ret = v4l2_async_register_subdev(&priv->subdev); > if (ret < 0) > - goto error; > + goto error_async; > > dev_info(priv->dev, "%d lanes found\n", priv->lanes); > > return 0; > > -error: > +error_async: > v4l2_async_notifier_unregister(&priv->notifier); > v4l2_async_notifier_cleanup(&priv->notifier); > +error_mutex: > + mutex_destroy(&priv->lock); > > return ret; > } > @@ -1301,6 +1303,8 @@ static int rcsi2_remove(struct platform_device *pdev) > > pm_runtime_disable(&pdev->dev); > > + mutex_destroy(&priv->lock); > + > return 0; > } > >
diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c index e28eff0396888f2d..a02573dbd5da4f62 100644 --- a/drivers/media/platform/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c @@ -1245,14 +1245,14 @@ static int rcsi2_probe(struct platform_device *pdev) ret = rcsi2_probe_resources(priv, pdev); if (ret) { dev_err(priv->dev, "Failed to get resources\n"); - return ret; + goto error_mutex; } platform_set_drvdata(pdev, priv); ret = rcsi2_parse_dt(priv); if (ret) - return ret; + goto error_mutex; priv->subdev.owner = THIS_MODULE; priv->subdev.dev = &pdev->dev; @@ -1272,21 +1272,23 @@ static int rcsi2_probe(struct platform_device *pdev) ret = media_entity_pads_init(&priv->subdev.entity, NR_OF_RCAR_CSI2_PAD, priv->pads); if (ret) - goto error; + goto error_async; pm_runtime_enable(&pdev->dev); ret = v4l2_async_register_subdev(&priv->subdev); if (ret < 0) - goto error; + goto error_async; dev_info(priv->dev, "%d lanes found\n", priv->lanes); return 0; -error: +error_async: v4l2_async_notifier_unregister(&priv->notifier); v4l2_async_notifier_cleanup(&priv->notifier); +error_mutex: + mutex_destroy(&priv->lock); return ret; } @@ -1301,6 +1303,8 @@ static int rcsi2_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); + mutex_destroy(&priv->lock); + return 0; }