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 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
macintosh
/
windfarm_pm121.c
diff --git
a/drivers/macintosh/windfarm_pm121.c
b/drivers/macintosh/windfarm_pm121.c
index
947d4af
..
30e6195
100644
(file)
--- a/
drivers/macintosh/windfarm_pm121.c
+++ b/
drivers/macintosh/windfarm_pm121.c
@@
-482,7
+482,7
@@
static s32 pm121_correct(s32 new_setpoint,
new_min += correction->offset;
new_min = (new_min >> 16) + min;
- return max
(new_setpoint, max(new_min, 0)
);
+ return max
3(new_setpoint, new_min, 0
);
}
static s32 pm121_connect(unsigned int control_id, s32 setpoint)