diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 14:52:00 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 14:52:00 +0000 |
| commit | c6ad115876763e4f15055982ecb9579cb7abab5f (patch) | |
| tree | 75d2b0f5f31540ff8a2dcdde9e0f087b25c68868 /arch/arm/plat-s3c24xx/s3c244x-clock.c | |
| parent | 1d19fdba149f4db055902c30b27adfb7d1ead058 (diff) | |
| parent | 28ab44c5be60a9b91021a7cc7b4e202775c04764 (diff) | |
Merge branch 'next-s3c24xx' into next-merged
Diffstat (limited to 'arch/arm/plat-s3c24xx/s3c244x-clock.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/s3c244x-clock.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c24xx/s3c244x-clock.c b/arch/arm/plat-s3c24xx/s3c244x-clock.c index 7c09773ff9f..dde41f171af 100644 --- a/arch/arm/plat-s3c24xx/s3c244x-clock.c +++ b/arch/arm/plat-s3c24xx/s3c244x-clock.c @@ -31,7 +31,6 @@ #include <linux/sysdev.h> #include <linux/interrupt.h> #include <linux/ioport.h> -#include <linux/mutex.h> #include <linux/clk.h> #include <linux/io.h> @@ -102,13 +101,13 @@ static int s3c244x_clk_add(struct sys_device *sysdev) if (clk_get_rate(clock_upll) > (94 * MHZ)) { clk_usb_bus.rate = clk_get_rate(clock_upll) / 2; - mutex_lock(&clocks_mutex); + spin_lock(&clocks_lock); clkdivn = __raw_readl(S3C2410_CLKDIVN); clkdivn |= S3C2440_CLKDIVN_UCLK; __raw_writel(clkdivn, S3C2410_CLKDIVN); - mutex_unlock(&clocks_mutex); + spin_unlock(&clocks_lock); } return 0; |