raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach

Browse Source 
[ Upstream commit b33d567560 ]

In panel_attach, if misc_register fails, we need to delete scan_timer,
which was setup in keypad_init->init_scan_timer.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: zhengbin <zhengbin13@huawei.com>
Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
zhengbin
2019-07-08 20:42:18 +08:00
committed by Greg Kroah-Hartman
parent ceac72e0a8
commit c1b16e1427
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/auxdisplay/panel.c
View File

@@ -1617,6 +1617,8 @@ static void panel_attach(struct parport *port)
return; return;
err_lcd_unreg: err_lcd_unreg:
if (scan_timer.function)
del_timer_sync(&scan_timer);
if (lcd.enabled) if (lcd.enabled)
charlcd_unregister(lcd.charlcd); charlcd_unregister(lcd.charlcd);
err_unreg_device: err_unreg_device: