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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 8D6ACC32753 for ; Fri, 2 Aug 2019 09:49:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A0622087E for ; Fri, 2 Aug 2019 09:49:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739350; bh=sw7NaxbdxmEM6aRee2IGjhr908nG873HqFG3gLRoZso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Zu8iVtdk2dtKuaEhayMqK2kAqEhoU+Psy0XF3yxuscO1pcB896AKM2If+2HfHqwZn aod9bgTNHEJtmqaoseU9yZiY2Ttm8kOvuhiID2dz6EiwwpdD2lFQlxnPqJ53behJ7J Z7mZNc/2V8PVR+j/+Sr8B/sNZtVhZ92K/ekC8J/s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405963AbfHBJtJ (ORCPT ); Fri, 2 Aug 2019 05:49:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:54214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405300AbfHBJsn (ORCPT ); Fri, 2 Aug 2019 05:48:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B91F8206A2; Fri, 2 Aug 2019 09:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739323; bh=sw7NaxbdxmEM6aRee2IGjhr908nG873HqFG3gLRoZso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MJY+GaKRG4x5D+BqA/u0Nbg/IFkEojDdm5ZtUHQ8sf8YoASB/gUroMORqjcf9C8ZO x+s8i2KSMwxGXHMDgLHsYb9h8HYaPGhpuhaAa4+KWdxbkRdpepDdtFZ0r61IclRIYS +DfWhRPPIWUAVK9g3YUsiW03HAhwG41AtbG++53E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Kefeng Wang , Baruch Siach , Sasha Levin Subject: [PATCH 4.9 167/223] tty/serial: digicolor: Fix digicolor-usart already registered warning Date: Fri, 2 Aug 2019 11:36:32 +0200 Message-Id: <20190802092248.856080642@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092238.692035242@linuxfoundation.org> References: <20190802092238.692035242@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit c7ad9ba0611c53cfe194223db02e3bca015f0674 ] When modprobe/rmmod/modprobe module, if platform_driver_register() fails, the kernel complained, proc_dir_entry 'driver/digicolor-usart' already registered WARNING: CPU: 1 PID: 5636 at fs/proc/generic.c:360 proc_register+0x19d/0x270 Fix this by adding uart_unregister_driver() when platform_driver_register() fails. Reported-by: Hulk Robot Signed-off-by: Kefeng Wang Acked-by: Baruch Siach Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/digicolor-usart.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/digicolor-usart.c b/drivers/tty/serial/digicolor-usart.c index 02ad6953b167..50ec5f1ac77f 100644 --- a/drivers/tty/serial/digicolor-usart.c +++ b/drivers/tty/serial/digicolor-usart.c @@ -545,7 +545,11 @@ static int __init digicolor_uart_init(void) if (ret) return ret; - return platform_driver_register(&digicolor_uart_platform); + ret = platform_driver_register(&digicolor_uart_platform); + if (ret) + uart_unregister_driver(&digicolor_uart); + + return ret; } module_init(digicolor_uart_init); -- 2.20.1