On Thu, Jan 08, 2015 at 05:39:44AM -0800, Anshul Garg wrote:
> From: Anshul Garg <[email protected]>
> 
> As input_pass_values function is called everytime when EV_SYN is sent
> from input driver or input event buffer becomes full.
> So in case of regular handler event filter code should not run so added
> check whether handler supports filter or not.
> 
> Signed-off-by: Anshul Garg <[email protected]>

Applied, thank you.

> ---
>  drivers/input/input.c |   24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/input/input.c b/drivers/input/input.c
> index 213e3a1..de55279 100644
> --- a/drivers/input/input.c
> +++ b/drivers/input/input.c
> @@ -100,23 +100,24 @@ static unsigned int input_to_handler(struct 
> input_handle *handle,
>       struct input_value *end = vals;
>       struct input_value *v;
>  
> -     for (v = vals; v != vals + count; v++) {
> -             if (handler->filter &&
> -                 handler->filter(handle, v->type, v->code, v->value))
> -                     continue;
> -             if (end != v)
> -                     *end = *v;
> -             end++;
> +     if (handler->filter) {
> +             for (v = vals; v != vals + count; v++) {
> +                     if (handler->filter(handle, v->type, v->code, v->value))
> +                             continue;
> +                     if (end != v)
> +                             *end = *v;
> +                     end++;
> +             }
> +             count = end - vals;
>       }
>  
> -     count = end - vals;
>       if (!count)
>               return 0;
>  
>       if (handler->events)
>               handler->events(handle, vals, count);
>       else if (handler->event)
> -             for (v = vals; v != end; v++)
> +             for (v = vals; v != vals + count; v++)
>                       handler->event(handle, v->type, v->code, v->value);
>  
>       return count;
> @@ -143,8 +144,11 @@ static void input_pass_values(struct input_dev *dev,
>               count = input_to_handler(handle, vals, count);
>       } else {
>               list_for_each_entry_rcu(handle, &dev->h_list, d_node)
> -                     if (handle->open)
> +                     if (handle->open) {
>                               count = input_to_handler(handle, vals, count);
> +                             if (!count)
> +                                     break;
> +                     }
>       }
>  
>       rcu_read_unlock();
> -- 
> 1.7.9.5
> 
> 
> ---
> This email has been checked for viruses by Avast antivirus software.
> http://www.avast.com
> 

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to