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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 81CBAC04E53 for ; Wed, 15 May 2019 12:12:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43D1120675 for ; Wed, 15 May 2019 12:12:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557922378; bh=8cgPjWbl6HPAC1RR8pT7d4K1TnN/Zpzs6aXY9cSY86k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IFsacNv7VnRQW2EOpcKyBOovNu880orNV0/XsSOsCiDYCKgPjUnLG3XAMkS2pmudR n0FU9cL7JYS7zBPK3dz5slOGnKiNEChxtKHU43DdK2SxoK9B6mTh/r4+36ykkFaCSU /uBMe2ZTSZETdDsL6Hb6o2IT2eOBhmgea6e+gY/0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728426AbfEOMM5 (ORCPT ); Wed, 15 May 2019 08:12:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:35632 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728628AbfEOLF1 (ORCPT ); Wed, 15 May 2019 07:05:27 -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 61C382084F; Wed, 15 May 2019 11:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918326; bh=8cgPjWbl6HPAC1RR8pT7d4K1TnN/Zpzs6aXY9cSY86k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JgpIECQIRnLrX0IV7TCvaX3OpsjFv2nHtYd0ftKCtph/j1fOfOSB4+mDex9mevdG6 CzutNmZ2xbm+yjGJTay1hOxX+ZRDYeHAOqDBZrRuz24M7zBeIeGdsytKYN1uy7rmVo SifwLR1IyYTPkDeYSn4N0r3ZBpg4cwcIsVvSv618= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mao Wenan , Vladimir Zapolskiy , "Sasha Levin (Microsoft)" Subject: [PATCH 4.4 091/266] sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init() Date: Wed, 15 May 2019 12:53:18 +0200 Message-Id: <20190515090725.525024750@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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