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