diff options
| author | Michael Turquette <mturquette@linaro.org> | 2015-03-24 23:33:33 (GMT) |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-03-24 23:47:43 (GMT) |
| commit | c77662a4df847e7b75ff8c5f2314dd4f022377e3 (patch) | |
| tree | fbf34d2f4c260bc413d51b1591f21854532f67b7 /drivers/clk/ti/dpll.c | |
| parent | 3966fab8b6abfe0fa55418fb9455c0b05735c1b0 (diff) | |
| parent | 9089848d9afa34a796988b5b666c2c4e611ccb61 (diff) | |
| download | linux-c77662a4df847e7b75ff8c5f2314dd4f022377e3.tar.xz | |
Merge branch 'for-4.1-clk-ti' of github.com:t-kristo/linux-pm into clk-next
Diffstat (limited to 'drivers/clk/ti/dpll.c')
| -rw-r--r-- | drivers/clk/ti/dpll.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c index 81dc469..11478a5 100644 --- a/drivers/clk/ti/dpll.c +++ b/drivers/clk/ti/dpll.c @@ -390,18 +390,18 @@ static void __init of_ti_dpll_setup(struct device_node *node, #endif } else { dd->idlest_reg = ti_clk_get_reg_addr(node, 1); - if (!dd->idlest_reg) + if (IS_ERR(dd->idlest_reg)) goto cleanup; dd->mult_div1_reg = ti_clk_get_reg_addr(node, 2); } - if (!dd->control_reg || !dd->mult_div1_reg) + if (IS_ERR(dd->control_reg) || IS_ERR(dd->mult_div1_reg)) goto cleanup; if (dd->autoidle_mask) { dd->autoidle_reg = ti_clk_get_reg_addr(node, 3); - if (!dd->autoidle_reg) + if (IS_ERR(dd->autoidle_reg)) goto cleanup; } |