AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

media: pulse8-cec: close serio in disconnect, not adap_free

Browse Source 
The serio_close() call was moved to pulse8_cec_adap_free(),
but that can be too late if that is called after the serio
core pulled down the serio already, in which case you get
a kernel oops.

Keep it in the disconnect().

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Fixes: 601282d65b ("media: pulse8-cec: use adap_free callback")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Hans Verkuil 2020-01-24 15:52:38 +01:00 committed by Mauro Carvalho Chehab
parent 34a818882e
commit aa9eda7612
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/usb/pulse8-cec/pulse8-cec.c
View File

@ -635,8 +635,6 @@ static void pulse8_cec_adap_free(struct cec_adapter *adap)
cancel_delayed_work_sync(&pulse8->ping_eeprom_work); cancel_delayed_work_sync(&pulse8->ping_eeprom_work);
cancel_work_sync(&pulse8->irq_work); cancel_work_sync(&pulse8->irq_work);
cancel_work_sync(&pulse8->tx_work); cancel_work_sync(&pulse8->tx_work);
serio_close(pulse8->serio);
serio_set_drvdata(pulse8->serio, NULL);
kfree(pulse8); kfree(pulse8);
} }
@ -652,6 +650,9 @@ static void pulse8_disconnect(struct serio *serio)
struct pulse8 *pulse8 = serio_get_drvdata(serio); struct pulse8 *pulse8 = serio_get_drvdata(serio);
cec_unregister_adapter(pulse8->adap); cec_unregister_adapter(pulse8->adap);
pulse8->serio = NULL;
serio_set_drvdata(serio, NULL);
serio_close(serio);
} }
static int pulse8_setup(struct pulse8 *pulse8, struct serio *serio, static int pulse8_setup(struct pulse8 *pulse8, struct serio *serio,
@ -872,10 +873,11 @@ static int pulse8_connect(struct serio *serio, struct serio_driver *drv)
return 0; return 0;
close_serio: close_serio:
pulse8->serio = NULL;
serio_set_drvdata(serio, NULL);
serio_close(serio); serio_close(serio);
delete_adap: delete_adap:
cec_delete_adapter(pulse8->adap); cec_delete_adapter(pulse8->adap);
serio_set_drvdata(serio, NULL);
free_device: free_device:
kfree(pulse8); kfree(pulse8);
return err; return err;