diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-01 19:55:26 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-01 19:55:26 +0900 |
commit | 0f7dafd44e2de131f67fca87378e30ca86bc00d5 (patch) | |
tree | af28ce75d6e09bb09c89aa1dc01bff341d5f7bfa /drivers/clk/clk-vt8500.c | |
parent | c361cb59acbb503c033971e8be8c029bbfd67f18 (diff) | |
parent | d68c380590c390a488fe214e5ebf9439216ac3ba (diff) | |
download | lwn-0f7dafd44e2de131f67fca87378e30ca86bc00d5.tar.gz lwn-0f7dafd44e2de131f67fca87378e30ca86bc00d5.zip |
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
Pull clock subsystem fixes from Mike Turquette:
"A mix of small fixes affecting mostly ARM platforms as well as a
discrete clock expander chip. Most fixes are corrections to lousy
clock data of one form or another."
* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
clk: mxs: Include clk mxs header file
clk: vt8500: Fix unbalanced spinlock in vt8500_dclk_set_rate()
clk: si5351: Set initial clkout rate when defined in platform data.
clk: si5351: Fix clkout rate computation.
clk: samsung: Add CLK_IGNORE_UNUSED flag for the sysreg clocks
clk: ux500: clk-sysctrl: handle clocks with no parents
clk: ux500: Provide device enumeration number suffix for SMSC911x
Diffstat (limited to 'drivers/clk/clk-vt8500.c')
-rw-r--r-- | drivers/clk/clk-vt8500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c index debf688afa8e..553ac35bcc91 100644 --- a/drivers/clk/clk-vt8500.c +++ b/drivers/clk/clk-vt8500.c @@ -183,7 +183,7 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate, writel(divisor, cdev->div_reg); vt8500_pmc_wait_busy(); - spin_lock_irqsave(cdev->lock, flags); + spin_unlock_irqrestore(cdev->lock, flags); return 0; } |