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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 40571C433DF for ; Thu, 18 Jun 2020 01:10:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1760F20CC7 for ; Thu, 18 Jun 2020 01:10:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442630; bh=/Nc+hSAuWuRAEuQ7FuotPfq5gihrarSON0Sq73x3r+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zISUSvPIBv2LIclDZq4XUk8n/dq7S/0ONuo+NHIP6J08O/eiLktLIYLP6K+Po4WnG taWMQimlPRo2Ct3wM1BPceG3FdBOpN/QEZ0KD/gN9xN1l2J6pjnUbJigieJcrak350 JVsWnVaCk9HERCU8DQFhn3se6dSf00mNOmda1lhQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728512AbgFRBK2 (ORCPT ); Wed, 17 Jun 2020 21:10:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:37548 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728486AbgFRBKY (ORCPT ); Wed, 17 Jun 2020 21:10:24 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 78A7221924; Thu, 18 Jun 2020 01:10:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442624; bh=/Nc+hSAuWuRAEuQ7FuotPfq5gihrarSON0Sq73x3r+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=my/YNyd3PdKE0DQZq7YAS2rvy6WducYQrp/HW4x1G83FApVrgoJIQ6yKWyy4AaTIT gfk/LJKZTNEbvPI2djUcgdBE2iyEZdSCcPNZBrayw7Pndt8HMLkm4XOdqpyX5cb1Nq wBJi6woj1CS+IsDRtTtIC1bRhyW/UP1dM2vu5ieg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Pavel Machek (CIP)" , Jerome Brunet , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: [PATCH AUTOSEL 5.7 103/388] ASoC: meson: add missing free_irq() in error path Date: Wed, 17 Jun 2020 21:03:20 -0400 Message-Id: <20200618010805.600873-103-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Pavel Machek (CIP)" [ Upstream commit 3b8a299a58b2afce464ae11324b59dcf0f1d10a7 ] free_irq() is missing in case of error, fix that. Signed-off-by: Pavel Machek (CIP) Reviewed-by: Jerome Brunet Link: https://lore.kernel.org/r/20200606153103.GA17905@amd Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/meson/axg-fifo.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c index 2e9b56b29d31..b2e867113226 100644 --- a/sound/soc/meson/axg-fifo.c +++ b/sound/soc/meson/axg-fifo.c @@ -249,7 +249,7 @@ int axg_fifo_pcm_open(struct snd_soc_component *component, /* Enable pclk to access registers and clock the fifo ip */ ret = clk_prepare_enable(fifo->pclk); if (ret) - return ret; + goto free_irq; /* Setup status2 so it reports the memory pointer */ regmap_update_bits(fifo->map, FIFO_CTRL1, @@ -269,8 +269,14 @@ int axg_fifo_pcm_open(struct snd_soc_component *component, /* Take memory arbitror out of reset */ ret = reset_control_deassert(fifo->arb); if (ret) - clk_disable_unprepare(fifo->pclk); + goto free_clk; + + return 0; +free_clk: + clk_disable_unprepare(fifo->pclk); +free_irq: + free_irq(fifo->irq, ss); return ret; } EXPORT_SYMBOL_GPL(axg_fifo_pcm_open); -- 2.25.1