summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2020-02-25 17:14:03 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2020-09-02 10:01:43 +0100
commite18015a0066f185539027fc7f2584cfc675c2524 (patch)
tree498f961ee07e2a13d5382332890f8b64275f1da8
parent822c8b08d121492c823b050d0f8779aa674a19f3 (diff)
gpio: mvebu: honour EPROBE_DEFER for devm_clk_get()
Honour deferred probing for devm_clk_get() so that we can get the clock for PWM. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--drivers/gpio/gpio-mvebu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index f15ac32d663f..a698d2ba6435 100644
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -1135,6 +1135,9 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
}
mvchip->clk = devm_clk_get(&pdev->dev, NULL);
+ if (mvchip->clk == ERR_PTR(-EPROBE_DEFER))
+ return -EPROBE_DEFER;
+
/* Not all SoCs require a clock.*/
if (!IS_ERR(mvchip->clk))
clk_prepare_enable(mvchip->clk);