summaryrefslogtreecommitdiff
path: root/drivers/clk/ti/interface.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2015-02-23 21:06:08 +0200
committerTero Kristo <t-kristo@ti.com>2015-03-24 20:23:36 +0200
commitc807dbedb5e5adbd4e1e2d07574d230df924a5a7 (patch)
treea1479d6552f50ed68c66a25cc4860b8f68c21bfa /drivers/clk/ti/interface.c
parentc517d838eb7d07bbe9507871fab3931deccff539 (diff)
clk: ti: fix ti_clk_get_reg_addr error handling
There is a case where NULL can be a valid return value for ti_clk_get_reg_addr, specifically the case where both the provider index and register offsets are zero. In this case, the current error checking against a NULL pointer will fail. Thus, change the API to return a ERR_PTR value in an error case, and change all the users of this API to check against IS_ERR instead. Signed-off-by: Tero Kristo <t-kristo@ti.com> Acked-by: Michael Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/ti/interface.c')
-rw-r--r--drivers/clk/ti/interface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/ti/interface.c b/drivers/clk/ti/interface.c
index 265d91f071c5..c76230d8dd04 100644
--- a/drivers/clk/ti/interface.c
+++ b/drivers/clk/ti/interface.c
@@ -111,7 +111,7 @@ static void __init _of_ti_interface_clk_setup(struct device_node *node,
u32 val;
reg = ti_clk_get_reg_addr(node, 0);
- if (!reg)
+ if (IS_ERR(reg))
return;
if (!of_property_read_u32(node, "ti,bit-shift", &val))