| Message ID | 20201212174119.120027-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 7113469dafc2d545fa4fa9bc649c31dc27db492e |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | media: vsp1: Fix an error handling path in the probe function | expand |
On Sun, Dec 13, 2020 at 5:22 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > A previous 'rcar_fcp_get()' call must be undone in the error handling path, > as already done in the remove function. > > Fixes: 94fcdf829793 ("[media] v4l: vsp1: Add FCP support") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
Hi Christophe, On 12/12/2020 17:41, Christophe JAILLET wrote: > A previous 'rcar_fcp_get()' call must be undone in the error handling path, > as already done in the remove function. Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > Fixes: 94fcdf829793 ("[media] v4l: vsp1: Add FCP support") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/media/platform/vsp1/vsp1_drv.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c > index dc62533cf32c..aa66e4f5f3f3 100644 > --- a/drivers/media/platform/vsp1/vsp1_drv.c > +++ b/drivers/media/platform/vsp1/vsp1_drv.c > @@ -882,8 +882,10 @@ static int vsp1_probe(struct platform_device *pdev) > } > > done: > - if (ret) > + if (ret) { > pm_runtime_disable(&pdev->dev); > + rcar_fcp_put(vsp1->fcp); > + } > > return ret; > } >
Hi Christophe, Thank you for the patch. On Sat, Dec 12, 2020 at 06:41:19PM +0100, Christophe JAILLET wrote: > A previous 'rcar_fcp_get()' call must be undone in the error handling path, > as already done in the remove function. > > Fixes: 94fcdf829793 ("[media] v4l: vsp1: Add FCP support") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> and queued in my tree for v5.12. > --- > drivers/media/platform/vsp1/vsp1_drv.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c > index dc62533cf32c..aa66e4f5f3f3 100644 > --- a/drivers/media/platform/vsp1/vsp1_drv.c > +++ b/drivers/media/platform/vsp1/vsp1_drv.c > @@ -882,8 +882,10 @@ static int vsp1_probe(struct platform_device *pdev) > } > > done: > - if (ret) > + if (ret) { > pm_runtime_disable(&pdev->dev); > + rcar_fcp_put(vsp1->fcp); > + } > > return ret; > }
diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c index dc62533cf32c..aa66e4f5f3f3 100644 --- a/drivers/media/platform/vsp1/vsp1_drv.c +++ b/drivers/media/platform/vsp1/vsp1_drv.c @@ -882,8 +882,10 @@ static int vsp1_probe(struct platform_device *pdev) } done: - if (ret) + if (ret) { pm_runtime_disable(&pdev->dev); + rcar_fcp_put(vsp1->fcp); + } return ret; }
A previous 'rcar_fcp_get()' call must be undone in the error handling path, as already done in the remove function. Fixes: 94fcdf829793 ("[media] v4l: vsp1: Add FCP support") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/media/platform/vsp1/vsp1_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)