diff options
| author | zhengbin <zhengbin13@huawei.com> | 2019-07-08 08:42:18 -0400 |
|---|---|---|
| committer | Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> | 2019-08-05 16:33:31 -0400 |
| commit | b33d567560c1aadf3033290d74d4fd67af47aa61 (patch) | |
| tree | 6d349e0ed5b620c34f67c8578fa275fb03bf33c2 | |
| parent | e21a712a9685488f5ce80495b37b9fdbe96c230d (diff) | |
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@huawei.com>
Signed-off-by: zhengbin <zhengbin13@huawei.com>
Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
| -rw-r--r-- | drivers/auxdisplay/panel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c index e06de63497cf..e6bd727da503 100644 --- a/drivers/auxdisplay/panel.c +++ b/drivers/auxdisplay/panel.c | |||
| @@ -1617,6 +1617,8 @@ static void panel_attach(struct parport *port) | |||
| 1617 | return; | 1617 | return; |
| 1618 | 1618 | ||
| 1619 | err_lcd_unreg: | 1619 | err_lcd_unreg: |
| 1620 | if (scan_timer.function) | ||
| 1621 | del_timer_sync(&scan_timer); | ||
| 1620 | if (lcd.enabled) | 1622 | if (lcd.enabled) |
| 1621 | charlcd_unregister(lcd.charlcd); | 1623 | charlcd_unregister(lcd.charlcd); |
| 1622 | err_unreg_device: | 1624 | err_unreg_device: |