openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Chander Kashyap 2012-09-21 11:08:32 +09:00 committed by Kukjin Kim
parent 377acfbbcf
commit 13acc29119
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/plat-samsung/clock.c
View File

@ -119,7 +119,7 @@ void clk_disable(struct clk *clk)
unsigned long clk_get_rate(struct clk *clk) unsigned long clk_get_rate(struct clk *clk)
{ {
if (IS_ERR(clk)) if (IS_ERR_OR_NULL(clk))
return 0; return 0;
if (clk->rate != 0) if (clk->rate != 0)
@ -136,7 +136,7 @@ unsigned long clk_get_rate(struct clk *clk)
long clk_round_rate(struct clk *clk, unsigned long rate) long clk_round_rate(struct clk *clk, unsigned long rate)
{ {
if (!IS_ERR(clk) && clk->ops && clk->ops->round_rate) if (!IS_ERR_OR_NULL(clk) && clk->ops && clk->ops->round_rate)
return (clk->ops->round_rate)(clk, rate); return (clk->ops->round_rate)(clk, rate);
return rate; return rate;
@ -146,7 +146,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
{ {
int ret; int ret;
if (IS_ERR(clk)) if (IS_ERR_OR_NULL(clk))
return -EINVAL; return -EINVAL;
/* We do not default just do a clk->rate = rate as /* 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)
{ {
int ret = 0; int ret = 0;
if (IS_ERR(clk)) if (IS_ERR_OR_NULL(clk) || IS_ERR_OR_NULL(parent))
return -EINVAL; return -EINVAL;
spin_lock(&clocks_lock); spin_lock(&clocks_lock);