leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: atkbd - fix canceling event_work in disconnect

Browse Source 
We need to first unregister input device and only then cancel event work
since events can arrive (and cause event work to get scheduled again)
until input_unregister_device() returns.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2010-01-05 17:56:02 -08:00
parent 59b015133c
commit 0ef7a26af1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/input/keyboard/atkbd.c
View File

@ -855,10 +855,16 @@ static void atkbd_disconnect(struct serio *serio)
atkbd_disable(atkbd); atkbd_disable(atkbd);
/* make sure we don't have a command in flight */ input_unregister_device(atkbd->dev);
/*
* Make sure we don't have a command in flight.
* Note that since atkbd->enabled is false event work will keep
* rescheduling itself until it gets canceled and will not try
* accessing freed input device or serio port.
*/
cancel_delayed_work_sync(&atkbd->event_work); cancel_delayed_work_sync(&atkbd->event_work);
input_unregister_device(atkbd->dev);
serio_close(serio); serio_close(serio);
serio_set_drvdata(serio, NULL); serio_set_drvdata(serio, NULL);
kfree(atkbd); kfree(atkbd);