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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 50098C04FF3 for ; Mon, 24 May 2021 14:46:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37721613CB for ; Mon, 24 May 2021 14:46:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233291AbhEXOsX (ORCPT ); Mon, 24 May 2021 10:48:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:54154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233168AbhEXOr6 (ORCPT ); Mon, 24 May 2021 10:47:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5AB4A613D0; Mon, 24 May 2021 14:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621867590; bh=N6QBhbaoixqNSH7hQZQXy04G9OzUiSPwdaXmmotnH0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OrEWw6BOU+/vtIfbzaeBs2u1xheNjfxiRzH7AHCbA84dIe4JjLrPm17Vwsn5IUzL8 +klowIxuIbjPmcVVBwecxzbC19bexh6QttYFSFbHthj0TpjAOXs0K+b5epctNt3zPf y7DYMzvvKG/yhnytBiwH7aJ1zXI4midxMF+IHk88tw83q9X9xmS9mP39Vj4HiZnZYm JjIFkOuHuTeqLEfC8E8giuE8yjUWTXu7b0T/B/vIaMevu16qW3AzgUAKsjqYLc0bZu Esxp5TonP9rK+/Aii+DPs0z1etoCauFbAPEDvEG2Yy7qTlc+7RDGEeLArW2jAWWiWq W2lxFGZoRjgMQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Atul Gopinathan , Jiri Slaby , Greg Kroah-Hartman , Sasha Levin , linux-serial@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 07/63] serial: max310x: unregister uart driver in case of failure and abort Date: Mon, 24 May 2021 10:45:24 -0400 Message-Id: <20210524144620.2497249-7-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210524144620.2497249-1-sashal@kernel.org> References: <20210524144620.2497249-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Atul Gopinathan [ Upstream commit 3890e3dea315f1a257d1b940a2a4e2fa16a7b095 ] The macro "spi_register_driver" invokes the function "__spi_register_driver()" which has a return type of int and can fail, returning a negative value in such a case. This is currently ignored and the init() function yields success even if the spi driver failed to register. Fix this by collecting the return value of "__spi_register_driver()" and also unregister the uart driver in case of failure. Cc: Jiri Slaby Signed-off-by: Atul Gopinathan Link: https://lore.kernel.org/r/20210503115736.2104747-12-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/max310x.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 93f69b66b896..43e55e6abea6 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -1518,10 +1518,12 @@ static int __init max310x_uart_init(void) return ret; #ifdef CONFIG_SPI_MASTER - spi_register_driver(&max310x_spi_driver); + ret = spi_register_driver(&max310x_spi_driver); + if (ret) + uart_unregister_driver(&max310x_uart); #endif - return 0; + return ret; } module_init(max310x_uart_init); -- 2.30.2