| Message ID | 1434292334-22312-1-git-send-email-vladimir_zapolskiy@mentor.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Lee, Thierry, On 14.06.2015 17:32, Vladimir Zapolskiy wrote: > If pwm is requested by legacy pwm_request() and if the following > backlight_device_register() call fails, add pwm_free() clean-up. > > Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> > --- > drivers/video/backlight/pwm_bl.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c > index 9991cdb..a691247 100644 > --- a/drivers/video/backlight/pwm_bl.c > +++ b/drivers/video/backlight/pwm_bl.c > @@ -307,6 +307,8 @@ static int pwm_backlight_probe(struct platform_device *pdev) > if (IS_ERR(bl)) { > dev_err(&pdev->dev, "failed to register backlight\n"); > ret = PTR_ERR(bl); > + if (pb->legacy) > + pwm_free(pb->pwm); > goto err_alloc; > } > > could you please apply this trivial fix? Thank you in advance. -- With best wishes, Vladimir -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, 14 Jun 2015, Vladimir Zapolskiy wrote: > If pwm is requested by legacy pwm_request() and if the following > backlight_device_register() call fails, add pwm_free() clean-up. > > Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> > --- > drivers/video/backlight/pwm_bl.c | 2 ++ > 1 file changed, 2 insertions(+) Applied, thanks. > diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c > index 9991cdb..a691247 100644 > --- a/drivers/video/backlight/pwm_bl.c > +++ b/drivers/video/backlight/pwm_bl.c > @@ -307,6 +307,8 @@ static int pwm_backlight_probe(struct platform_device *pdev) > if (IS_ERR(bl)) { > dev_err(&pdev->dev, "failed to register backlight\n"); > ret = PTR_ERR(bl); > + if (pb->legacy) > + pwm_free(pb->pwm); > goto err_alloc; > } >
Hi Lee, On 22.09.2015 02:23, Lee Jones wrote: > On Sun, 14 Jun 2015, Vladimir Zapolskiy wrote: > >> If pwm is requested by legacy pwm_request() and if the following >> backlight_device_register() call fails, add pwm_free() clean-up. >> >> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> >> --- >> drivers/video/backlight/pwm_bl.c | 2 ++ >> 1 file changed, 2 insertions(+) > > Applied, thanks. > I've just encountered that this change is not present in v4.4-rc, also it is not in yours for-backlight-next branch, could you please double check the status of the change? Thank you in advance. Best wishes, Vladimir >> diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c >> index 9991cdb..a691247 100644 >> --- a/drivers/video/backlight/pwm_bl.c >> +++ b/drivers/video/backlight/pwm_bl.c >> @@ -307,6 +307,8 @@ static int pwm_backlight_probe(struct platform_device *pdev) >> if (IS_ERR(bl)) { >> dev_err(&pdev->dev, "failed to register backlight\n"); >> ret = PTR_ERR(bl); >> + if (pb->legacy) >> + pwm_free(pb->pwm); >> goto err_alloc; >> } >> > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 04 Jan 2016, Vladimir Zapolskiy wrote: > On 22.09.2015 02:23, Lee Jones wrote: > > On Sun, 14 Jun 2015, Vladimir Zapolskiy wrote: > > > >> If pwm is requested by legacy pwm_request() and if the following > >> backlight_device_register() call fails, add pwm_free() clean-up. > >> > >> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> > >> --- > >> drivers/video/backlight/pwm_bl.c | 2 ++ > >> 1 file changed, 2 insertions(+) > > > > Applied, thanks. > > > > I've just encountered that this change is not present in v4.4-rc, also it is > not in yours for-backlight-next branch, could you please double check the > status of the change? Looks like this slipped though the gaps. Reapplied, thanks. > >> diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c > >> index 9991cdb..a691247 100644 > >> --- a/drivers/video/backlight/pwm_bl.c > >> +++ b/drivers/video/backlight/pwm_bl.c > >> @@ -307,6 +307,8 @@ static int pwm_backlight_probe(struct platform_device *pdev) > >> if (IS_ERR(bl)) { > >> dev_err(&pdev->dev, "failed to register backlight\n"); > >> ret = PTR_ERR(bl); > >> + if (pb->legacy) > >> + pwm_free(pb->pwm); > >> goto err_alloc; > >> } > >> > > >
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 9991cdb..a691247 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -307,6 +307,8 @@ static int pwm_backlight_probe(struct platform_device *pdev) if (IS_ERR(bl)) { dev_err(&pdev->dev, "failed to register backlight\n"); ret = PTR_ERR(bl); + if (pb->legacy) + pwm_free(pb->pwm); goto err_alloc; }
If pwm is requested by legacy pwm_request() and if the following backlight_device_register() call fails, add pwm_free() clean-up. Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> --- drivers/video/backlight/pwm_bl.c | 2 ++ 1 file changed, 2 insertions(+)