From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Wed, 3 Jun 2015 05:17:14 +0000 (+0200)
Subject: backlight: pwm: don't try legacy API when devm_pwm_get() returns -EPROBE_DEFER
X-Git-Tag: KARO-TXA5-2015-06-26~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;ds=sidebyside;h=49858e0d0dd45c8ea508e81c7a2c104e759550ce;p=karo-tx-linux.git

backlight: pwm: don't try legacy API when devm_pwm_get() returns -EPROBE_DEFER
---

diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 3a145a643e0d..88d4a73cfd62 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -274,7 +274,11 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 
 	pb->pwm = devm_pwm_get(&pdev->dev, NULL);
 	if (IS_ERR(pb->pwm)) {
-		dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n");
+		ret = PTR_ERR(pb->pwm);
+		if (ret == -EPROBE_DEFER)
+			goto err_alloc;
+		dev_err(&pdev->dev,
+			"unable to request PWM: %d; trying legacy API\n", ret);
 		pb->legacy = true;
 		pb->pwm = pwm_request(data->pwm_id, "pwm-backlight");
 		if (IS_ERR(pb->pwm)) {