OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'v3.6-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes 

* 'v3.6-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Use spin_lock_{irqsave,irqrestore} in clk_set_rate
  ARM: SAMSUNG: use spin_lock_irqsave() in clk_set_parent
This commit is contained in:
Olof Johansson 2012-09-18 07:40:02 -07:00
parent 5698bd757d d6838a62b4
commit d7235b8b92
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,6 +144,7 @@ long clk_round_rate(struct clk *clk, unsigned long rate)
int clk_set_rate(struct clk *clk, unsigned long rate) int clk_set_rate(struct clk *clk, unsigned long rate)
{ {
unsigned long flags;
int ret; int ret;
if (IS_ERR(clk)) if (IS_ERR(clk))
@ -159,9 +160,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
if (clk->ops == NULL || clk->ops->set_rate == NULL) if (clk->ops == NULL || clk->ops->set_rate == NULL)
return -EINVAL; return -EINVAL;
spin_lock(&clocks_lock); spin_lock_irqsave(&clocks_lock, flags);
ret = (clk->ops->set_rate)(clk, rate); ret = (clk->ops->set_rate)(clk, rate);
spin_unlock(&clocks_lock); spin_unlock_irqrestore(&clocks_lock, flags);
return ret; return ret;
} }
@ -173,17 +174,18 @@ struct clk *clk_get_parent(struct clk *clk)
int clk_set_parent(struct clk *clk, struct clk *parent) int clk_set_parent(struct clk *clk, struct clk *parent)
{ {
unsigned long flags;
int ret = 0; int ret = 0;
if (IS_ERR(clk)) if (IS_ERR(clk))
return -EINVAL; return -EINVAL;
spin_lock(&clocks_lock); spin_lock_irqsave(&clocks_lock, flags);
if (clk->ops && clk->ops->set_parent) if (clk->ops && clk->ops->set_parent)
ret = (clk->ops->set_parent)(clk, parent); ret = (clk->ops->set_parent)(clk, parent);
spin_unlock(&clocks_lock); spin_unlock_irqrestore(&clocks_lock, flags);
return ret; return ret;
} }