[2.6 patch] drivers/input/joystick/iforce/iforce-main.c: fix check after use

From: Adrian Bunk
Date: Wed Mar 23 2005 - 22:21:27 EST


This patch fixes an obvious check after use found by the Coverity
checker.

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.12-rc1-mm1-full/drivers/input/joystick/iforce/iforce-main.c.old 2005-03-24 02:28:48.000000000 +0100
+++ linux-2.6.12-rc1-mm1-full/drivers/input/joystick/iforce/iforce-main.c 2005-03-24 02:29:15.000000000 +0100
@@ -221,15 +221,15 @@ static int iforce_erase_effect(struct in
int err = 0;
struct iforce_core_effect* core_effect;

+ if (effect_id < 0 || effect_id >= FF_EFFECTS_MAX)
+ return -EINVAL;
+
/* Check who is trying to erase this effect */
if (iforce->core_effects[effect_id].owner != current->pid) {
printk(KERN_WARNING "iforce-main.c: %d tried to erase an effect belonging to %d\n", current->pid, iforce->core_effects[effect_id].owner);
return -EACCES;
}

- if (effect_id < 0 || effect_id >= FF_EFFECTS_MAX)
- return -EINVAL;
-
core_effect = iforce->core_effects + effect_id;

if (test_bit(FF_MOD1_IS_USED, core_effect->flags))

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/