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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 9A700C10F11 for ; Mon, 22 Apr 2019 19:54:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 608E52075A for ; Mon, 22 Apr 2019 19:54:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962853; bh=jSUcl9FTy+Z9gNbafOdV5Z13QHtEpu7pdFsb7L8gVsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eB7XaYFoL1LtUkQpdJUJZcZQMwJ7S47zaDeKpo/Xy8m7MQ79baMHrJ+ezGEfCDhJD 0cO5fq2RTePllDV1RvunRWfmhjZTVGYjslQ/O53pASZkM5JzZ4UrTUujwRZgKDC/Bk EWp4OhinELenUPI/hZTjSwxNtoxaQFe+4Ecoj8Cc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731456AbfDVTyL (ORCPT ); Mon, 22 Apr 2019 15:54:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:53662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730928AbfDVTtr (ORCPT ); Mon, 22 Apr 2019 15:49:47 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 9D9CD218CD; Mon, 22 Apr 2019 19:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962586; bh=jSUcl9FTy+Z9gNbafOdV5Z13QHtEpu7pdFsb7L8gVsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BMMRIMMsFQ/RFezg/z6y2NvyA/nMdYIMgVDKHx+os0VtzZaGy7rGW/vCyGFBWA2Zn yNLRAu00DfWguzZgAQVq8NJcoZZ6NGP3p8QbZCXlzzA8D6GsW2a4vKGwQv7ub4KbjP ikFe6xHHCDlmObTH2VMsgWSMj7PxtU9PlCMxrCuo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mao Wenan , Greg Kroah-Hartman , Sasha Levin , linux-serial@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 03/21] sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init() Date: Mon, 22 Apr 2019 15:49:23 -0400 Message-Id: <20190422194941.13433-3-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194941.13433-1-sashal@kernel.org> References: <20190422194941.13433-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mao Wenan [ Upstream commit ac0cdb3d990108df795b676cd0d0e65ac34b2273 ] Add the missing uart_unregister_driver() and i2c_del_driver() before return from sc16is7xx_init() in the error handling case. Signed-off-by: Mao Wenan Reviewed-by: Vladimir Zapolskiy Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin (Microsoft) --- drivers/tty/serial/sc16is7xx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 17a22073d226..032f3c13b8c4 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1448,7 +1448,7 @@ static int __init sc16is7xx_init(void) ret = i2c_add_driver(&sc16is7xx_i2c_uart_driver); if (ret < 0) { pr_err("failed to init sc16is7xx i2c --> %d\n", ret); - return ret; + goto err_i2c; } #endif @@ -1456,10 +1456,18 @@ static int __init sc16is7xx_init(void) ret = spi_register_driver(&sc16is7xx_spi_uart_driver); if (ret < 0) { pr_err("failed to init sc16is7xx spi --> %d\n", ret); - return ret; + goto err_spi; } #endif return ret; + +err_spi: +#ifdef CONFIG_SERIAL_SC16IS7XX_I2C + i2c_del_driver(&sc16is7xx_i2c_uart_driver); +#endif +err_i2c: + uart_unregister_driver(&sc16is7xx_uart); + return ret; } module_init(sc16is7xx_init); -- 2.19.1