diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 16:12:32 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 16:12:32 +0200 |
| commit | c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015 (patch) | |
| tree | a80672ee82fcc3d9c8d486e53731eb19cd968eb0 /drivers/clk/ti/gate.c | |
| parent | daa67b4b70568a07fef3cffacb2055891bf42ddb (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
| download | talos-op-linux-c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015.tar.gz talos-op-linux-c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015.zip | |
Merge branch 'linus' into timers/core
Make sure the upstream fixes are applied before adding further
modifications.
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); |
