[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1562589738-10595-1-git-send-email-zhengbin13@huawei.com>
Date: Mon, 8 Jul 2019 20:42:18 +0800
From: zhengbin <zhengbin13@...wei.com>
To: <willy@...roxy.com>, <ksenija.stanojevic@...il.com>,
<miguel.ojeda.sandonis@...il.com>, <linux-kernel@...r.kernel.org>
CC: <yi.zhang@...wei.com>, <zhengbin13@...wei.com>
Subject: [PATCH] auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach
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@...wei.com>
Signed-off-by: zhengbin <zhengbin13@...wei.com>
---
drivers/auxdisplay/panel.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c
index e06de63..e6bd727 100644
--- a/drivers/auxdisplay/panel.c
+++ b/drivers/auxdisplay/panel.c
@@ -1617,6 +1617,8 @@ static void panel_attach(struct parport *port)
return;
err_lcd_unreg:
+ if (scan_timer.function)
+ del_timer_sync(&scan_timer);
if (lcd.enabled)
charlcd_unregister(lcd.charlcd);
err_unreg_device:
--
2.7.4
Powered by blists - more mailing lists