From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F06EC3A589 for ; Tue, 20 Aug 2019 13:45:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A7FF22DA7 for ; Tue, 20 Aug 2019 13:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566308706; bh=UqPLbRUjKob2xRECZCZzqGiSacjK3QK0Y260YxC6SuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ob66AD8ApIc754vzlJLbF8aIMjWVCfrS7TMFJsHYYXgobpKBd47OfuyH0+g5vmcqp STS1gmDJ9j+dEdeOC1a/QvNXXFR536Hty2vvaMU8h/ykUp+9GxWxTaRUSX1VepVX4g e81UAW4e1iNXdxjh18wX+2xolZUasmqfteBWNKL0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730703AbfHTNpB (ORCPT ); Tue, 20 Aug 2019 09:45:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:38458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730750AbfHTNm7 (ORCPT ); Tue, 20 Aug 2019 09:42:59 -0400 Received: from sasha-vm.mshome.net (unknown [12.236.144.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E5E26230F2; Tue, 20 Aug 2019 13:42:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566308578; bh=UqPLbRUjKob2xRECZCZzqGiSacjK3QK0Y260YxC6SuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zTkJ4kWbrAa4WIU4AEhAnI6RPVU9OT7PrccZYQ75PV10i55X9c/VfAMB17KBrxKgQ STtOpesVq/Q5h2Fa6Q7nIB/8IG4McwaJX5HOkou5Ypz2wp3qFozhif/wK23neKko0l 94zA+ohsXDuOKCti69v4kBhvNHdfK/hFGbC44YWE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: zhengbin , Hulk Robot , Miguel Ojeda , Sasha Levin Subject: [PATCH AUTOSEL 4.14 03/12] auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach Date: Tue, 20 Aug 2019 09:42:44 -0400 Message-Id: <20190820134253.11562-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190820134253.11562-1-sashal@kernel.org> References: <20190820134253.11562-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: zhengbin [ 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 Signed-off-by: zhengbin Signed-off-by: Miguel Ojeda Signed-off-by: Sasha Levin --- drivers/auxdisplay/panel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c index 6911acd896d93..e30953ceb7dfd 100644 --- a/drivers/auxdisplay/panel.c +++ b/drivers/auxdisplay/panel.c @@ -1622,6 +1622,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.20.1