diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-16 22:58:46 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-16 22:58:46 +0100 |
| commit | 0ffda6cca2c66e42d0ad65719f58c637ed180b05 (patch) | |
| tree | dc042159ff1573f5451d2671c737311a7ac7b949 /arch/arm/plat-s3c24xx/pwm-clock.c | |
| parent | c472273f863c80b87e53356256c5466df24328f0 (diff) | |
| parent | 55b404fd78792d7a88d19f2534510ee42841146f (diff) | |
Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux into s3c64xx
Diffstat (limited to 'arch/arm/plat-s3c24xx/pwm-clock.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/pwm-clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c index b8e854f1b1d..3fad68a1e6b 100644 --- a/arch/arm/plat-s3c24xx/pwm-clock.c +++ b/arch/arm/plat-s3c24xx/pwm-clock.c @@ -315,7 +315,7 @@ static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent) if (parent == s3c24xx_pwmclk_tclk(id)) bits = S3C2410_TCFG1_MUX_TCLK << shift; else if (parent == s3c24xx_pwmclk_tdiv(id)) - bits = clk_pwm_tdiv_bits(to_tdiv(clk)) << shift; + bits = clk_pwm_tdiv_bits(to_tdiv(parent)) << shift; else return -EINVAL; |