diff options
| author | Michael Turquette <mturquette@linaro.org> | 2015-03-24 16:33:33 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-03-24 16:47:43 -0700 |
| commit | c77662a4df847e7b75ff8c5f2314dd4f022377e3 (patch) | |
| tree | fbf34d2f4c260bc413d51b1591f21854532f67b7 /drivers/clk/ti/mux.c | |
| parent | 3966fab8b6abfe0fa55418fb9455c0b05735c1b0 (diff) | |
| parent | 9089848d9afa34a796988b5b666c2c4e611ccb61 (diff) | |
| download | linux-c77662a4df847e7b75ff8c5f2314dd4f022377e3.tar.bz2 | |
Merge branch 'for-4.1-clk-ti' of github.com:t-kristo/linux-pm into clk-next
Diffstat (limited to 'drivers/clk/ti/mux.c')
| -rw-r--r-- | drivers/clk/ti/mux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c index 728e253606bc..5cdeed538b08 100644 --- a/drivers/clk/ti/mux.c +++ b/drivers/clk/ti/mux.c @@ -210,7 +210,7 @@ static void of_mux_clk_setup(struct device_node *node) reg = ti_clk_get_reg_addr(node, 0); - if (!reg) + if (IS_ERR(reg)) goto cleanup; of_property_read_u32(node, "ti,bit-shift", &shift); @@ -283,7 +283,7 @@ static void __init of_ti_composite_mux_clk_setup(struct device_node *node) mux->reg = ti_clk_get_reg_addr(node, 0); - if (!mux->reg) + if (IS_ERR(mux->reg)) goto cleanup; if (!of_property_read_u32(node, "ti,bit-shift", &val)) |