diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-02-19 04:30:14 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2015-05-26 03:44:59 -0400 |
commit | 68feaca0b13e453aa14ee064c1736202b48b342f (patch) | |
tree | 14a9289678430eebe4c6bfb33bcdd6f39b440083 | |
parent | b787f68c36d49bb1d9236f403813641efa74a031 (diff) |
backlight: pwm: Handle EPROBE_DEFER while requesting the PWM
When trying to request the PWM device with devm_pwm_get(), the EPROBE_DEFER
flag is not handled properly. It can lead to the PWM not being found.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/video/backlight/pwm_bl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 3a145a643e0d..6897f1c1bc73 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c | |||
@@ -274,6 +274,10 @@ static int pwm_backlight_probe(struct platform_device *pdev) | |||
274 | 274 | ||
275 | pb->pwm = devm_pwm_get(&pdev->dev, NULL); | 275 | pb->pwm = devm_pwm_get(&pdev->dev, NULL); |
276 | if (IS_ERR(pb->pwm)) { | 276 | if (IS_ERR(pb->pwm)) { |
277 | ret = PTR_ERR(pb->pwm); | ||
278 | if (ret == -EPROBE_DEFER) | ||
279 | goto err_alloc; | ||
280 | |||
277 | dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); | 281 | dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); |
278 | pb->legacy = true; | 282 | pb->legacy = true; |
279 | pb->pwm = pwm_request(data->pwm_id, "pwm-backlight"); | 283 | pb->pwm = pwm_request(data->pwm_id, "pwm-backlight"); |