Browse Source

Merge tag 'backlight-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight

Pull backlight fix from Lee Jones:
 "One simple fix to correctly handle -EPROBE_DEFER"

* tag 'backlight-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: pwm: Handle EPROBE_DEFER while requesting the PWM
Linus Torvalds 10 years ago
parent
commit
30a7266f30
1 changed files with 4 additions and 0 deletions
  1. 4 0
      drivers/video/backlight/pwm_bl.c

+ 4 - 0
drivers/video/backlight/pwm_bl.c

@@ -274,6 +274,10 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 
 
 	pb->pwm = devm_pwm_get(&pdev->dev, NULL);
 	pb->pwm = devm_pwm_get(&pdev->dev, NULL);
 	if (IS_ERR(pb->pwm)) {
 	if (IS_ERR(pb->pwm)) {
+		ret = PTR_ERR(pb->pwm);
+		if (ret == -EPROBE_DEFER)
+			goto err_alloc;
+
 		dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n");
 		dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n");
 		pb->legacy = true;
 		pb->legacy = true;
 		pb->pwm = pwm_request(data->pwm_id, "pwm-backlight");
 		pb->pwm = pwm_request(data->pwm_id, "pwm-backlight");