From 14421c582893b71fdc25e4e0bd71fa1dcb2b7861 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 15 Jul 2009 13:03:35 +0100 Subject: [PATCH] --- yaml --- r: 156493 b: refs/heads/master c: 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd h: refs/heads/master i: 156491: 3288738f6490918a439bd5087b949ee8bb8220b2 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a81b656ec77e..8c8f0e4cf9ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d91e1a296244690461a7c36d71710dfbabbc219 +refs/heads/master: 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd diff --git a/trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c b/trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c index f8165e622478..febac1950d8e 100644 --- a/trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c +++ b/trunk/arch/arm/plat-s3c64xx/s3c6400-clock.c @@ -175,7 +175,7 @@ static int s3c64xx_clk_arm_set_rate(struct clk *clk, unsigned long rate) div = clk_get_rate(clk->parent) / rate; val = __raw_readl(S3C_CLK_DIV0); - val &= armclk_mask; + val &= ~armclk_mask; val |= (div - 1); __raw_writel(val, S3C_CLK_DIV0);