diff options
| author | Tero Kristo <t-kristo@ti.com> | 2015-02-23 21:06:08 +0200 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2015-03-24 20:23:36 +0200 |
| commit | c807dbedb5e5adbd4e1e2d07574d230df924a5a7 (patch) | |
| tree | a1479d6552f50ed68c66a25cc4860b8f68c21bfa /drivers/clk/ti/gate.c | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | linux-c807dbedb5e5adbd4e1e2d07574d230df924a5a7.tar.bz2 | |
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/gate.c')
| -rw-r--r-- | drivers/clk/ti/gate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c index d493307b73f4..0c6fdfcd5f93 100644 --- a/drivers/clk/ti/gate.c +++ b/drivers/clk/ti/gate.c @@ -225,7 +225,7 @@ static void __init _of_ti_gate_clk_setup(struct device_node *node, if (ops != &omap_gate_clkdm_clk_ops) { 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)) @@ -264,7 +264,7 @@ _of_ti_composite_gate_clk_setup(struct device_node *node, return; gate->enable_reg = ti_clk_get_reg_addr(node, 0); - if (!gate->enable_reg) + if (IS_ERR(gate->enable_reg)) goto cleanup; of_property_read_u32(node, "ti,bit-shift", &val); |