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.0 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=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 39ED3C433DB for ; Wed, 30 Dec 2020 13:10:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F212422227 for ; Wed, 30 Dec 2020 13:10:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727788AbgL3NKM (ORCPT ); Wed, 30 Dec 2020 08:10:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:53804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727234AbgL3NE6 (ORCPT ); Wed, 30 Dec 2020 08:04:58 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4BE452222A; Wed, 30 Dec 2020 13:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609333448; bh=RfDIi+ld6PVLeo0NMQXjKVHQtzypeNuRJnbtIICYHuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/g1K0/7tHIrBFTFA3+hB44D/5NYSzIQrka/vuFmgyRtlwXEV/osOJFyjF0K89Z4W tk+dPGGa2Kd1qBiAkiXnK+6DEUJPSbtO3ESs61kswFq91XuRCnU+yddGNS2WRIk51X IiG9xSQXdr43iES14StBJsySpyjZ8a/tDCWMfkU3JfgDxq1P0mDclNehwXcqkuGirH Kb79Bfgb5qeFPjSTXO67hKmjG/Wm/YIBNKw9c2kuHbd1lecWzgzcbMfhQ12PnER8NI mDsx+ndk8H3MyRPHnfR3KPEj7dcViiNXGO38vHZgTMoJEt9sdNS4vmoKPT8YnFwUDS eTcG3H1WVefEw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qinglang Miao , Boris Brezillon , Sasha Levin , linux-i3c@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 07/17] i3c master: fix missing destroy_workqueue() on error in i3c_master_register Date: Wed, 30 Dec 2020 08:03:47 -0500 Message-Id: <20201230130357.3637261-7-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201230130357.3637261-1-sashal@kernel.org> References: <20201230130357.3637261-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: Qinglang Miao [ Upstream commit 59165d16c699182b86b5c65181013f1fd88feb62 ] Add the missing destroy_workqueue() before return from i3c_master_register in the error handling case. Signed-off-by: Qinglang Miao Signed-off-by: Boris Brezillon Link: https://lore.kernel.org/linux-i3c/20201028091543.136167-1-miaoqinglang@huawei.com Signed-off-by: Sasha Levin --- drivers/i3c/master.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 6cc71c90f85ea..19337aed9f235 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -2492,7 +2492,7 @@ int i3c_master_register(struct i3c_master_controller *master, ret = i3c_master_bus_init(master); if (ret) - goto err_put_dev; + goto err_destroy_wq; ret = device_add(&master->dev); if (ret) @@ -2523,6 +2523,9 @@ int i3c_master_register(struct i3c_master_controller *master, err_cleanup_bus: i3c_master_bus_cleanup(master); +err_destroy_wq: + destroy_workqueue(master->wq); + err_put_dev: put_device(&master->dev); -- 2.27.0 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, 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 4E0E7C433DB for ; Thu, 31 Dec 2020 17:38:00 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F365F223DB for ; Thu, 31 Dec 2020 17:37:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F365F223DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-i3c-bounces+linux-i3c=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XBFHfBlDrM+sbEbbiIIXi+GAKsOeDsJdBLE4q4cj28k=; b=sMhLof++Wl6J/v5Bf8OKK3vEu 7Rak/9VMCWS6gxr+z/tHxWUkc8ILeeIJWwEcDNirvn23BW3Ula3/iZDSikIG+vWKd/pgn4BlKZqcs oWtnCIqYti8qJzlWLs+yWtcQemLCO03C3j0p7xAdRaW8FlN9JJrEotj6Sw/IiA6I7sRNi7so0CZaX qI348w+XXjzCg9PiNeelWSWV4v8FudNM7WG+7LIhIc8yzerMD1ADLGr8b15TW2ikE9Fg/xvh/DP2g H5s+x5P9B7MWIyxH+Lze2a7bChqqsLYWw1P0SaUyeA5Osth4vmRS49/VX1wsGXOpx9mevesu6vDWz XAN9yirpg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kv1te-0005gP-PT; Thu, 31 Dec 2020 17:37:58 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kub96-0008Gx-OQ for linux-i3c@lists.infradead.org; Wed, 30 Dec 2020 13:04:10 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4BE452222A; Wed, 30 Dec 2020 13:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609333448; bh=RfDIi+ld6PVLeo0NMQXjKVHQtzypeNuRJnbtIICYHuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/g1K0/7tHIrBFTFA3+hB44D/5NYSzIQrka/vuFmgyRtlwXEV/osOJFyjF0K89Z4W tk+dPGGa2Kd1qBiAkiXnK+6DEUJPSbtO3ESs61kswFq91XuRCnU+yddGNS2WRIk51X IiG9xSQXdr43iES14StBJsySpyjZ8a/tDCWMfkU3JfgDxq1P0mDclNehwXcqkuGirH Kb79Bfgb5qeFPjSTXO67hKmjG/Wm/YIBNKw9c2kuHbd1lecWzgzcbMfhQ12PnER8NI mDsx+ndk8H3MyRPHnfR3KPEj7dcViiNXGO38vHZgTMoJEt9sdNS4vmoKPT8YnFwUDS eTcG3H1WVefEw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 07/17] i3c master: fix missing destroy_workqueue() on error in i3c_master_register Date: Wed, 30 Dec 2020 08:03:47 -0500 Message-Id: <20201230130357.3637261-7-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201230130357.3637261-1-sashal@kernel.org> References: <20201230130357.3637261-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201230_080409_240447_A23379D7 X-CRM114-Status: GOOD ( 10.09 ) X-Mailman-Approved-At: Thu, 31 Dec 2020 12:37:56 -0500 X-BeenThere: linux-i3c@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , linux-i3c@lists.infradead.org, Boris Brezillon , Qinglang Miao Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-i3c" Errors-To: linux-i3c-bounces+linux-i3c=archiver.kernel.org@lists.infradead.org From: Qinglang Miao [ Upstream commit 59165d16c699182b86b5c65181013f1fd88feb62 ] Add the missing destroy_workqueue() before return from i3c_master_register in the error handling case. Signed-off-by: Qinglang Miao Signed-off-by: Boris Brezillon Link: https://lore.kernel.org/linux-i3c/20201028091543.136167-1-miaoqinglang@huawei.com Signed-off-by: Sasha Levin --- drivers/i3c/master.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 6cc71c90f85ea..19337aed9f235 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -2492,7 +2492,7 @@ int i3c_master_register(struct i3c_master_controller *master, ret = i3c_master_bus_init(master); if (ret) - goto err_put_dev; + goto err_destroy_wq; ret = device_add(&master->dev); if (ret) @@ -2523,6 +2523,9 @@ int i3c_master_register(struct i3c_master_controller *master, err_cleanup_bus: i3c_master_bus_cleanup(master); +err_destroy_wq: + destroy_workqueue(master->wq); + err_put_dev: put_device(&master->dev); -- 2.27.0 -- linux-i3c mailing list linux-i3c@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-i3c