On Sun, Jan 03, 2016 at 11:21:16PM +0200, Ivaylo Dimitrov wrote:
> Commit 4ea14a53d8f881034fa9e186653821c4e3d9a8fb ("Input: gpio-keys -
> report error when disabling unsupported key") tried to prevent an
> unsupported key to disabled. Unfortunately it effectively broke the driver
> in a way so no key is possible to be disabled. Fix that by providing the
> correct verify logic.
Hmm, indeed...
>
> Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@xxxxxxxxx>
> ---
> drivers/input/keyboard/gpio_keys.c | 28 +++++++++++++++++++---------
> 1 file changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
> index bef317f..a371805 100644
> --- a/drivers/input/keyboard/gpio_keys.c
> +++ b/drivers/input/keyboard/gpio_keys.c
> @@ -226,22 +226,32 @@ static ssize_t gpio_keys_attr_store_helper(struct gpio_keys_drvdata *ddata,
> goto out;
>
> /* First validate */
> - for (i = 0; i < ddata->pdata->nbuttons; i++) {
> - struct gpio_button_data *bdata = &ddata->data[i];
> + for (i = 0; i < n_events; i++) {
for_each_set_bit()?
OTOH maybe we should do
bitmap = get_bitmap_events_by_type(type); // new, return keybit or swbit
if (!bitmap_subset(bits, bitmap, n_events)) {
error = -EINVAL;
goto out;
}
... and leave the rest of the loop as is?
Thanks.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
