The patch titled
atmel_pwm: set up only one PWM clock when allocating a clock
has been removed from the -mm tree. Its filename was
atmel_pwm-set-up-only-one-pwm-clock-when-allocating-a-clock.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: atmel_pwm: set up only one PWM clock when allocating a clock
From: Hans-Christian Egtvedt <hans-christian.egtvedt@xxxxxxxxx>
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@xxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/misc/atmel_pwm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff -puN drivers/misc/atmel_pwm.c~atmel_pwm-set-up-only-one-pwm-clock-when-allocating-a-clock drivers/misc/atmel_pwm.c
--- a/drivers/misc/atmel_pwm.c~atmel_pwm-set-up-only-one-pwm-clock-when-allocating-a-clock
+++ a/drivers/misc/atmel_pwm.c
@@ -211,8 +211,7 @@ int pwm_clk_alloc(unsigned prescale, uns
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;
}
_
Patches currently in -mm which might be from hans-christian.egtvedt@xxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
