From 3638cbe8d8e8afdb860570cd8e4064fe27ecacce Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Mon, 5 May 2008 11:50:59 -0400 Subject: [PATCH] --- yaml --- r: 104183 b: refs/heads/master c: 923104747d5c4d58762aa865f71d48d3beb73ae6 h: refs/heads/master i: 104181: cb1f626243ecaa854aac2a2efe8496eb2a552a90 104179: ef9cb8c36540fd636f857520df07b65fa33829a4 104175: e6a053e8195ce93a44d8b68987e710c0a4042a82 v: v3 --- [refs] | 2 +- trunk/drivers/input/ff-memless.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4c9586aa4499..9d68292424b6 100644 --- 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 index d226d935b0dc..6790e975a98c 100644 --- 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: