diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/macintosh/windfarm_pm121.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/macintosh/windfarm_pm121.c')
| -rw-r--r-- | drivers/macintosh/windfarm_pm121.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/windfarm_pm121.c b/drivers/macintosh/windfarm_pm121.c index 947d4afa25ca..30e6195e19d4 100644 --- a/drivers/macintosh/windfarm_pm121.c +++ b/drivers/macintosh/windfarm_pm121.c | |||
| @@ -482,7 +482,7 @@ static s32 pm121_correct(s32 new_setpoint, | |||
| 482 | new_min += correction->offset; | 482 | new_min += correction->offset; |
| 483 | new_min = (new_min >> 16) + min; | 483 | new_min = (new_min >> 16) + min; |
| 484 | 484 | ||
| 485 | return max(new_setpoint, max(new_min, 0)); | 485 | return max3(new_setpoint, new_min, 0); |
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | static s32 pm121_connect(unsigned int control_id, s32 setpoint) | 488 | static s32 pm121_connect(unsigned int control_id, s32 setpoint) |