---

yaml --- r: 104183 b: refs/heads/master c: 9231047 h: refs/heads/master i: 104181: cb1f626 104179: ef9cb8c 104175: e6a053e v: v3
git-mirror · May 16, 2008 · 3638cbe · 3638cbe
1 parent 57be4e7
commit 3638cbe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6a3ead2ab5d82b549237c52a785b9f736e13463
+refs/heads/master: 923104747d5c4d58762aa865f71d48d3beb73ae6
diff --git a/trunk/drivers/input/ff-memless.c b/trunk/drivers/input/ff-memless.c
@@ -247,9 +247,9 @@ static void ml_combine_effects(struct ff_effect *effect,
 		 * in s8, this should be changed to something more generic
 		 */
 		effect->u.ramp.start_level =
-			max(min(effect->u.ramp.start_level + x, 0x7f), -0x80);
+			clamp_val(effect->u.ramp.start_level + x, -0x80, 0x7f);
 		effect->u.ramp.end_level =
-			max(min(effect->u.ramp.end_level + y, 0x7f), -0x80);
+			clamp_val(effect->u.ramp.end_level + y, -0x80, 0x7f);
 		break;
 
 	case FF_RUMBLE: