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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F6ADC4167E for ; Thu, 13 Oct 2022 00:29:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231648AbiJMA3A (ORCPT ); Wed, 12 Oct 2022 20:29:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230474AbiJMAYs (ORCPT ); Wed, 12 Oct 2022 20:24:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95778DCAC5; Wed, 12 Oct 2022 17:24:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5CD27B81CE6; Thu, 13 Oct 2022 00:22:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61AB8C433C1; Thu, 13 Oct 2022 00:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665620545; bh=hLGgv80zqb0eH/0rrXCcqjAM83ghk/Zxp3QBbxDGP7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=urRz0cQ12btGspoANQ7XpHxO7nYP1tltT92pWkNiuiAuTAAi7T5ua7n/8akt+Xp2w dcmA2qsBbHRY4Qwqh28J++RJhsDGStKqvwCM72NgXZVAOt4K4DcoGBZLaEWkRpVXSl e53aZrGvy4SOFfaMTFTt7FduZp89qsTopmvD2zEkF3b+5mHmGVdb1Nthe7lFQdajlJ 6Vkk+uXb7wiRBooDvyIf+9dOhg2qMMPMWu3QIIneHlX79O5MFm8VuK70AqBmS5GX5W wJ5Su2r9kMRQwJDoH79HjCS/bb7TWvxB3k/NXWbm2mxO8BJFB05/9nYidSwFichvVI e25aXiyGC0EwA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pierre-Louis Bossart , Rander Wang , Bard Liao , Vinod Koul , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.15 22/47] soundwire: intel: fix error handling on dai registration issues Date: Wed, 12 Oct 2022 20:20:57 -0400 Message-Id: <20221013002124.1894077-22-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221013002124.1894077-1-sashal@kernel.org> References: <20221013002124.1894077-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: Pierre-Louis Bossart [ Upstream commit c6867cda906aadbce5e71efde9c78a26108b2bad ] The call to intel_register_dai() may fail because of memory allocation issues or problems reported by the ASoC core. In all cases, when a error is thrown the component is not registered, it's invalid to unregister it. Signed-off-by: Pierre-Louis Bossart Reviewed-by: Rander Wang Signed-off-by: Bard Liao Link: https://lore.kernel.org/r/20220919175721.354679-2-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/soundwire/intel.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 38e7f1a2bb97..89ee033f0c35 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -1407,7 +1407,6 @@ int intel_link_startup(struct auxiliary_device *auxdev) ret = intel_register_dai(sdw); if (ret) { dev_err(dev, "DAI registration failed: %d\n", ret); - snd_soc_unregister_component(dev); goto err_interrupt; } -- 2.35.1