summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2014-02-07 09:48:55 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-02-10 08:49:55 +0100
commitb0723e39ecb010bce48c46884858b98d2601ba50 (patch)
tree7d8fb9e9c8fb548de243b7608b053275cc64bbec /drivers
parent40fa265fabc1ca8b6853f7e362c9ddfab4fbb018 (diff)
downloadbarebox-b0723e39ecb010bce48c46884858b98d2601ba50.tar.gz
barebox-b0723e39ecb010bce48c46884858b98d2601ba50.tar.xz
clk: avoid possible NULL ptr deref
Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/clkdev.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 66cd832406..d9a1c21ae8 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -179,9 +179,11 @@ struct clk *clk_get(struct device_d *dev, const char *con_id)
if (!IS_ERR(clk))
return clk;
- clk = of_clk_get_by_name(dev->device_node, con_id);
- if (!IS_ERR(clk))
- return clk;
+ if (dev) {
+ clk = of_clk_get_by_name(dev->device_node, con_id);
+ if (!IS_ERR(clk))
+ return clk;
+ }
return clk_get_sys(dev_id, con_id);
}