git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
misc
/
atmel_pwm.c
diff --git
a/drivers/misc/atmel_pwm.c
b/drivers/misc/atmel_pwm.c
index
5b5a14d
..
6aa5294
100644
(file)
--- a/
drivers/misc/atmel_pwm.c
+++ b/
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;
}