lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 160/230] Input: matrix_keypad - use flush_delayed_work()
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit a342083abe576db43594a32d458a61fa81f7cb32 ]

    We should be using flush_delayed_work() instead of flush_work() in
    matrix_keypad_stop() to ensure that we are not missing work that is
    scheduled but not yet put in the workqueue (i.e. its delay timer has not
    expired yet).

    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/input/keyboard/matrix_keypad.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c
    index c64d87442a62..2e12e31f45c5 100644
    --- a/drivers/input/keyboard/matrix_keypad.c
    +++ b/drivers/input/keyboard/matrix_keypad.c
    @@ -220,7 +220,7 @@ static void matrix_keypad_stop(struct input_dev *dev)
    keypad->stopped = true;
    spin_unlock_irq(&keypad->lock);

    - flush_work(&keypad->work.work);
    + flush_delayed_work(&keypad->work);
    /*
    * matrix_keypad_scan() will leave IRQs enabled;
    * we should disable them now.
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-22 12:36    [W:4.332 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site