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 261F3257AD8; Tue, 25 Mar 2025 12:28:43 +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=1742905723; cv=none; b=g0kyxp+7FlxOE/naKfZtakulKo96T8YjTa+yywZmSIZCK9vddB1dogrMNHExNO7RomDwKe8OZllSwq9DYIeHzKQitZiE/ja5zfmDsuLy2tGGHcekfUkKmNYvhTE0Qy2Hr0dGJgTIp9pasAb4igutnRBuVOnwPrnwCUmytsIp3LI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742905723; c=relaxed/simple; bh=xtdYSRVqxh49G16nqJ2wuKfM3CllwJ5Amrs+T5mnHOA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t3AvfAmjvLFPo59RJhe8SCX7QvdXsClEGqKGrnXogTU8G/XqE9enn68fAdC80kchMC4yfIsOEhn0nTqQsbwd1KcaXfyyA/tlHYhtLivPgthQwyc7UuLlEPsroXXFs1IC7/2QQ94qCYSv/wZmXBQiZyzXBzoEM0anl6KOUK2pDhM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rY2E0Stu; 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="rY2E0Stu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD9F1C4CEE4; Tue, 25 Mar 2025 12:28:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742905723; bh=xtdYSRVqxh49G16nqJ2wuKfM3CllwJ5Amrs+T5mnHOA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rY2E0StuldSl0PMea2Ggu3G3bnvC238TA+EUbi1cCfKBP7WQbNsWyUeJEv8EhpTLH rw08frdcM4lCzK5IIpDz9SEz3th0adR1F5GCtNFjw2vBcKCLoLOgds0VomFxzdGjHG owwAKGH073aKvSCHM6SweovvTK3dh19XVi7yl8M4= 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.1 128/198] ASoC: codecs: wm0010: Fix error handling path in wm0010_spi_probe() Date: Tue, 25 Mar 2025 08:21:30 -0400 Message-ID: <20250325122200.010083865@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250325122156.633329074@linuxfoundation.org> References: <20250325122156.633329074@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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 034a4e858c7e6..602fa7cc2c5e2 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -951,7 +951,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) @@ -963,9 +963,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