summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-06-30 14:24:32 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-06-30 14:24:32 +0200
commit8c5932a64887cf0fafd224ca336aba494d5b1a12 (patch)
tree0d2c7411cd24b670544760b0291183c567eb7791 /drivers
parent7c5d0fa4cb54bf6cb7e3ca037ef9b7d4b6f74e6a (diff)
parent90f7eacb394c911e06179e29c72cb51b560b19e0 (diff)
downloadbarebox-8c5932a64887cf0fafd224ca336aba494d5b1a12.tar.gz
barebox-8c5932a64887cf0fafd224ca336aba494d5b1a12.tar.xz
Merge branch 'for-next/clk'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/clkdev.c2
1 files changed, 1 insertions, 1 deletions
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;
}