projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/pasem...
[powerpc.git]
/
drivers
/
input
/
ff-core.c
diff --git
a/drivers/input/ff-core.c
b/drivers/input/ff-core.c
index
35656ca
..
eebc724
100644
(file)
--- a/
drivers/input/ff-core.c
+++ b/
drivers/input/ff-core.c
@@
-203,7
+203,7
@@
static int erase_effect(struct input_dev *dev, int effect_id,
}
/**
}
/**
- * input_ff_erase - erase a
n
effect from device
+ * input_ff_erase - erase a
force-feedback
effect from device
* @dev: input device to erase effect from
* @effect_id: id of the ffect to be erased
* @file: purported owner of the request
* @dev: input device to erase effect from
* @effect_id: id of the ffect to be erased
* @file: purported owner of the request
@@
-281,7
+281,8
@@
int input_ff_event(struct input_dev *dev, unsigned int type,
break;
default:
break;
default:
- ff->playback(dev, code, value);
+ if (check_effect_access(ff, code, NULL) == 0)
+ ff->playback(dev, code, value);
break;
}
break;
}
@@
-347,7
+348,7
@@
EXPORT_SYMBOL_GPL(input_ff_create);
/**
* input_ff_free() - frees force feedback portion of input device
/**
* input_ff_free() - frees force feedback portion of input device
- * @dev: input device suppor
int
g force feedback
+ * @dev: input device suppor
tin
g force feedback
*
* This function is only needed in error path as input core will
* automatically free force feedback structures when device is
*
* This function is only needed in error path as input core will
* automatically free force feedback structures when device is