From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65F131FCCF2; Wed, 19 Mar 2025 14:36:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742394979; cv=none; b=Rwc2LYDOzV7r6kLiitAnDuLQ4xn2Tz7mbmU1oDGX8RWRhoRItkE2u2Ndb8eq7hhX4Hfb1zuwkRjV/K9dFZGO8GyIgwy8KHg9x+QyyFZ1N8pAnCJAH+Yf4dFxNRP5oLy5GQb1uxmvVuMF1rvgEuffz6B2vHeWu00yGarb0onM74E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742394979; c=relaxed/simple; bh=cisNbSetQLtzeZC1197lOJrkVZQBtIQaqusx5xwMSHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AV/sE2nAljrAJT64tpQNANj3TjXOBNbOYNZWLdsFj5uVrBCQN+SNDMLI2Bq/DNCwFlvpjMQ/okQ5NMQNW/lBgkjWDn2VhiKaMTnUobM35AKgCqhICI7D1t1wKH13ELEcNw0Ly1QzW/mK+juyF9c55y/2lKm4yV+4aLbNajWiTCM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Hk72CllN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Hk72CllN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C801C4CEE4; Wed, 19 Mar 2025 14:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742394979; bh=cisNbSetQLtzeZC1197lOJrkVZQBtIQaqusx5xwMSHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hk72CllNyhsK0GLQLrnfmt8zWL61cvrsPngp/84a/FmLSI0RHs6xFh82NmDc0Bvfn AqwpZ3wsL4BGkVZf8P27aNauEgLbpXIbzTp58WaZ+5AtXovcYfL/3F8cl8B1VELGqz qya4rinWIO1eaZLS0vX3UripQAq2dcuewu58j0L8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe JAILLET , Charles Keepax , Mark Brown , Sasha Levin Subject: [PATCH 6.13 217/241] ASoC: codecs: wm0010: Fix error handling path in wm0010_spi_probe() Date: Wed, 19 Mar 2025 07:31:27 -0700 Message-ID: <20250319143033.118485519@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143027.685727358@linuxfoundation.org> References: <20250319143027.685727358@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe JAILLET [ Upstream commit ed92bc5264c4357d4fca292c769ea9967cd3d3b6 ] Free some resources in the error handling path of the probe, as already done in the remove function. Fixes: e3523e01869d ("ASoC: wm0010: Add initial wm0010 DSP driver") Fixes: fd8b96574456 ("ASoC: wm0010: Clear IRQ as wake source and include missing header") Signed-off-by: Christophe JAILLET Reviewed-by: Charles Keepax Link: https://patch.msgid.link/5139ba1ab8c4c157ce04e56096a0f54a1683195c.1741549792.git.christophe.jaillet@wanadoo.fr Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm0010.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index edd2cb185c42c..9e67fbfc2ccaf 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -920,7 +920,7 @@ static int wm0010_spi_probe(struct spi_device *spi) if (ret) { dev_err(wm0010->dev, "Failed to set IRQ %d as wake source: %d\n", irq, ret); - return ret; + goto free_irq; } if (spi->max_speed_hz) @@ -932,9 +932,18 @@ static int wm0010_spi_probe(struct spi_device *spi) &soc_component_dev_wm0010, wm0010_dai, ARRAY_SIZE(wm0010_dai)); if (ret < 0) - return ret; + goto disable_irq_wake; return 0; + +disable_irq_wake: + irq_set_irq_wake(wm0010->irq, 0); + +free_irq: + if (wm0010->irq) + free_irq(wm0010->irq, wm0010); + + return ret; } static void wm0010_spi_remove(struct spi_device *spi) -- 2.39.5