From 90f7eacb394c911e06179e29c72cb51b560b19e0 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Tue, 13 Jun 2017 23:51:28 +0200 Subject: clk: let clk_get return errors from of_clk_get_by_name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When of_clk_get_by_name fails with -ENODEV it's fine to continue with clk_get_sys. Other errors (e.g. -EPROBE_DEFER) should be returned however. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer --- drivers/clk/clkdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 7f9f8f2adc..6b16663551 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -181,7 +181,7 @@ struct clk *clk_get(struct device_d *dev, const char *con_id) if (dev) { clk = of_clk_get_by_name(dev->device_node, con_id); - if (!IS_ERR(clk)) + if (!IS_ERR(clk) || PTR_ERR(clk) != -ENODEV) return clk; } -- cgit v1.2.3