aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChander Kashyap <chander.kashyap@linaro.org>2012-09-20 22:08:32 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-09-20 22:08:32 -0400
commit13acc291191281e2980e56dbe3a3d80ce677c9a8 (patch)
treefd8a56b1a37b45614c4cbd8dc7b5abe22301efc0 /arch
parent377acfbbcfd4abecdf837350e2c2906cc0a0e001 (diff)
ARM: SAMSUNG: Add check for NULL in clock interface
The clock instance parameter in Samsung clock interface is not being checked for NULL pointers. Add checks for NULL pointers. Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org> Acked-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-samsung/clock.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
index 65c5eca475e7..7938fbce825e 100644
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
@@ -119,7 +119,7 @@ void clk_disable(struct clk *clk)
119 119
120unsigned long clk_get_rate(struct clk *clk) 120unsigned long clk_get_rate(struct clk *clk)
121{ 121{
122 if (IS_ERR(clk)) 122 if (IS_ERR_OR_NULL(clk))
123 return 0; 123 return 0;
124 124
125 if (clk->rate != 0) 125 if (clk->rate != 0)
@@ -136,7 +136,7 @@ unsigned long clk_get_rate(struct clk *clk)
136 136
137long clk_round_rate(struct clk *clk, unsigned long rate) 137long clk_round_rate(struct clk *clk, unsigned long rate)
138{ 138{
139 if (!IS_ERR(clk) && clk->ops && clk->ops->round_rate) 139 if (!IS_ERR_OR_NULL(clk) && clk->ops && clk->ops->round_rate)
140 return (clk->ops->round_rate)(clk, rate); 140 return (clk->ops->round_rate)(clk, rate);
141 141
142 return rate; 142 return rate;
@@ -146,7 +146,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
146{ 146{
147 int ret; 147 int ret;
148 148
149 if (IS_ERR(clk)) 149 if (IS_ERR_OR_NULL(clk))
150 return -EINVAL; 150 return -EINVAL;
151 151
152 /* We do not default just do a clk->rate = rate as 152 /* We do not default just do a clk->rate = rate as
@@ -175,7 +175,7 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
175{ 175{
176 int ret = 0; 176 int ret = 0;
177 177
178 if (IS_ERR(clk)) 178 if (IS_ERR_OR_NULL(clk) || IS_ERR_OR_NULL(parent))
179 return -EINVAL; 179 return -EINVAL;
180 180
181 spin_lock(&clocks_lock); 181 spin_lock(&clocks_lock);