Commit 5aa0769d authored Jul 23, 2008 by Hans-Christian Egtvedt Committed by Linus Torvalds Jul 24, 2008

atmel_pwm: set up only one PWM clock when allocating a clock



This patch will only setup one clock, if free, and return this clock to the
caller.  The previous solution would setup both clocks with the same prescaler
and divider and return PWM_CPR_CLKB, thus taking both clocks in the same call
without the caller knowing.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 82736f4d

drivers/misc/atmel_pwm.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -211,8 +211,7 @@ int pwm_clk_alloc(unsigned prescale, unsigned div)
		if ((mr & 0xffff) == 0) {
		mr \|= val;
		ret = PWM_CPR_CLKA;
		}
		if ((mr & (0xffff << 16)) == 0) {
		} else if ((mr & (0xffff << 16)) == 0) {
		mr \|= val << 16;
		ret = PWM_CPR_CLKB;
		}

Admin message