---

yaml --- r: 105378 b: refs/heads/master c: 5aa0769 h: refs/heads/master v: v3
git-mirror · Jul 24, 2008 · e2819b4 · e2819b4
1 parent 2992b16
commit e2819b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82736f4d1d2b7063b829cc93171a6e5aea8a9c49
+refs/heads/master: 5aa0769d089125e63f8dc23e0283e559e1790493
diff --git a/trunk/drivers/misc/atmel_pwm.c b/trunk/drivers/misc/atmel_pwm.c
@@ -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;
 	}