projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux...
[deliverable/linux.git]
/
drivers
/
misc
/
atmel_pwm.c
diff --git
a/drivers/misc/atmel_pwm.c
b/drivers/misc/atmel_pwm.c
index 5b5a14dab3d38d5e77a26381f849d2e26822934c..6aa5294dfec4fc681305b03a63c1f8e63aecf0ee 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;
}
This page took
0.024272 seconds
and
5
git commands to generate.