diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-09-18 07:40:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-18 07:40:02 -0700 |
| commit | d7235b8b92e7f7bdff8d1af9981773c29537a7de (patch) | |
| tree | 6fe09a729049e72dc007b71cdea02fabdff73fee /arch | |
| parent | Linux 3.6-rc6 (diff) | |
| parent | ARM: SAMSUNG: Use spin_lock_{irqsave,irqrestore} in clk_set_rate (diff) | |
| download | linux-dev-d7235b8b92e7f7bdff8d1af9981773c29537a7de.tar.xz linux-dev-d7235b8b92e7f7bdff8d1af9981773c29537a7de.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-samsung/clock.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c index 65c5eca475e7..d1116e2dfbea 100644 --- a/arch/arm/plat-samsung/clock.c +++ b/arch/arm/plat-samsung/clock.c @@ -144,6 +144,7 @@ long clk_round_rate(struct clk *clk, unsigned long rate) int clk_set_rate(struct clk *clk, unsigned long rate) { + unsigned long flags; int ret; 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) return -EINVAL; - spin_lock(&clocks_lock); + spin_lock_irqsave(&clocks_lock, flags); ret = (clk->ops->set_rate)(clk, rate); - spin_unlock(&clocks_lock); + spin_unlock_irqrestore(&clocks_lock, flags); return ret; } @@ -173,17 +174,18 @@ struct clk *clk_get_parent(struct clk *clk) int clk_set_parent(struct clk *clk, struct clk *parent) { + unsigned long flags; int ret = 0; if (IS_ERR(clk)) return -EINVAL; - spin_lock(&clocks_lock); + spin_lock_irqsave(&clocks_lock, flags); if (clk->ops && clk->ops->set_parent) ret = (clk->ops->set_parent)(clk, parent); - spin_unlock(&clocks_lock); + spin_unlock_irqrestore(&clocks_lock, flags); return ret; } |