diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-10-28 22:07:57 -0400 |
---|---|---|
committer | Peter De Schrijver <pdeschrijver@nvidia.com> | 2013-11-28 08:09:22 -0500 |
commit | 62ce7cd62f534023224912dc9b909963f26a38da (patch) | |
tree | fa0cbe9c27a15cf5104aa4bbe50ba978ba948619 | |
parent | 8ba4b3b9cc3d95714b31467614205fc26b91fb7c (diff) |
clk: tegra: fix __clk_lookup() return value checks
In case of error, the function __clk_lookup() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
-rw-r--r-- | drivers/clk/tegra/clk-pll.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c index 8eb2755c71b3..2dd432266ef6 100644 --- a/drivers/clk/tegra/clk-pll.c +++ b/drivers/clk/tegra/clk-pll.c | |||
@@ -1490,7 +1490,7 @@ struct clk *tegra_clk_register_pllxc(const char *name, const char *parent_name, | |||
1490 | u32 val, val_iddq; | 1490 | u32 val, val_iddq; |
1491 | 1491 | ||
1492 | parent = __clk_lookup(parent_name); | 1492 | parent = __clk_lookup(parent_name); |
1493 | if (IS_ERR(parent)) { | 1493 | if (!parent) { |
1494 | WARN(1, "parent clk %s of %s must be registered first\n", | 1494 | WARN(1, "parent clk %s of %s must be registered first\n", |
1495 | name, parent_name); | 1495 | name, parent_name); |
1496 | return ERR_PTR(-EINVAL); | 1496 | return ERR_PTR(-EINVAL); |
@@ -1591,7 +1591,7 @@ struct clk *tegra_clk_register_pllm(const char *name, const char *parent_name, | |||
1591 | return ERR_PTR(-EINVAL); | 1591 | return ERR_PTR(-EINVAL); |
1592 | 1592 | ||
1593 | parent = __clk_lookup(parent_name); | 1593 | parent = __clk_lookup(parent_name); |
1594 | if (IS_ERR(parent)) { | 1594 | if (!parent) { |
1595 | WARN(1, "parent clk %s of %s must be registered first\n", | 1595 | WARN(1, "parent clk %s of %s must be registered first\n", |
1596 | name, parent_name); | 1596 | name, parent_name); |
1597 | return ERR_PTR(-EINVAL); | 1597 | return ERR_PTR(-EINVAL); |
@@ -1632,7 +1632,7 @@ struct clk *tegra_clk_register_pllc(const char *name, const char *parent_name, | |||
1632 | return ERR_PTR(-EINVAL); | 1632 | return ERR_PTR(-EINVAL); |
1633 | 1633 | ||
1634 | parent = __clk_lookup(parent_name); | 1634 | parent = __clk_lookup(parent_name); |
1635 | if (IS_ERR(parent)) { | 1635 | if (!parent) { |
1636 | WARN(1, "parent clk %s of %s must be registered first\n", | 1636 | WARN(1, "parent clk %s of %s must be registered first\n", |
1637 | name, parent_name); | 1637 | name, parent_name); |
1638 | return ERR_PTR(-EINVAL); | 1638 | return ERR_PTR(-EINVAL); |
@@ -1756,7 +1756,7 @@ struct clk *tegra_clk_register_pllss(const char *name, const char *parent_name, | |||
1756 | return ERR_PTR(-EINVAL); | 1756 | return ERR_PTR(-EINVAL); |
1757 | 1757 | ||
1758 | parent = __clk_lookup(parent_name); | 1758 | parent = __clk_lookup(parent_name); |
1759 | if (IS_ERR(parent)) { | 1759 | if (!parent) { |
1760 | WARN(1, "parent clk %s of %s must be registered first\n", | 1760 | WARN(1, "parent clk %s of %s must be registered first\n", |
1761 | name, parent_name); | 1761 | name, parent_name); |
1762 | return ERR_PTR(-EINVAL); | 1762 | return ERR_PTR(-EINVAL); |