Commit 377ebe61 authored Jul 08, 2019 by zhengbin Committed by Greg Kroah-Hartman Sep 06, 2019

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



[ Upstream commit b33d567560c1aadf3033290d74d4fd67af47aa61 ]

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>

parent 2f87eb89

drivers/auxdisplay/panel.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1618,6 +1618,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: