Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp178567pxb; Mon, 13 Sep 2021 16:21:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxApH+69M62N/28gXwXJRgO7/Y9WkSC6rzC/gqH6lSOFV0pMD2+hZHR1dDApptStuRkHZMB X-Received: by 2002:a05:6402:48b:: with SMTP id k11mr16281017edv.7.1631575259901; Mon, 13 Sep 2021 16:20:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631575259; cv=none; d=google.com; s=arc-20160816; b=eJg+D1ZrP6UaBqlDphctVbtl6srT5kqMaiBTPUIm9eT6TXHi6hJu2QBkUu2fThxr0W DSPSnb4gaCF2K+MJFEVsWWgMjB/ZAPYgvmJMTljcjEuqB4l+2mzUTZzTw1Op1kNNSO0f 8TE/+iyZnLPEXzeHIK/8m0N+arkSXhf+iiB01T5YdTuSCrJ4vPberhvQ5QOFgueXvLBN AZS0FYDIUYl4oOfkPAuHbBxgGxdbzh8cWLsCZhzVBPLyZPYt8F3XPcBdVnyYjTKCFtuI mG+sCyR3hk0YBFORd3Y+cv4TPp+gSFu/XUoq/GrHqx2fKzA9MBxmFRH7CnG6ntgGiQ2j zQ/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=O+embdr+DV4JjkwDA5R4WXfX0DvPvgmm6IGdGr7tt+g=; b=HBnIf2sW7iJWXnjmVsTiIqVX6ppAVehP9E26xTduLoDcpTR9aiG7mLKawWmp9dGLlW 13tYS3NqoDoPmctIT8O0Kho8AxV0O8JyKJ06JDH90++lfiUIYP7LnamEYXZBvqQ7xkf2 WTE3rZHqZCz3Pyu1kpUtkem2Jowk3otJKCCfAnavnbSt7Bo5Acwj9wlfmZAYppBzreIq 2rEeqQUxtXxxiVVvBL+duAxIc3F4QIDGkWLVk0FWODKAeaMmf9ktqc6gia7iE2vMwJLK /9zFkQOuNY4xinNsz2e8PVpol1QZs+3MTXIUsqmjyBs9ui/OddYSnppO6jQJeIrnldaH 7izA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cxUfefeW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h27si6031507ejl.479.2021.09.13.16.20.36; Mon, 13 Sep 2021 16:20:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cxUfefeW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346956AbhIMOrS (ORCPT + 99 others); Mon, 13 Sep 2021 10:47:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:58832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347242AbhIMOkZ (ORCPT ); Mon, 13 Sep 2021 10:40:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 377F861C45; Mon, 13 Sep 2021 13:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631541361; bh=ew6QFRbpjf61wu36p4LAqhVfJLhKx4rYLGyQkXg1Dp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cxUfefeWmzszz+S1qCO965nsudNy2mq1XQ+i5NDRum1mT7vVyXbRBQ4JVOI+tFWhw fYpxX69+urRsbeVUZJ3kc0zNh9of1QqsSkRmi8y0dUwWpbmoVJWLQrdzz56usePzzo yrNgSwaVGFM86f9uPEZvt5p01zRzTv0lS8L8bn7w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Mark Brown , Sasha Levin Subject: [PATCH 5.14 266/334] ASoC: wcd9335: Disable irq on slave ports in the remove function Date: Mon, 13 Sep 2021 15:15:20 +0200 Message-Id: <20210913131122.413637871@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131113.390368911@linuxfoundation.org> References: <20210913131113.390368911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET [ Upstream commit d3efd26af2e044ff2b48d38bb871630282d77e60 ] The probe calls 'wcd9335_setup_irqs()' to enable interrupts on all slave ports. This must be undone in the remove function. Add a 'wcd9335_teardown_irqs()' function that undoes 'wcd9335_setup_irqs()' function, and call it from the remove function. Fixes: 20aedafdf492 ("ASoC: wcd9335: add support to wcd9335 codec") Signed-off-by: Christophe JAILLET Message-Id: <8f761244d79bd4c098af8a482be9121d3a486d1b.1629091028.git.christophe.jaillet@wanadoo.fr> Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wcd9335.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 47fe68edea3a..d885ced34f60 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -4076,6 +4076,16 @@ static int wcd9335_setup_irqs(struct wcd9335_codec *wcd) return ret; } +static void wcd9335_teardown_irqs(struct wcd9335_codec *wcd) +{ + int i; + + /* disable interrupts on all slave ports */ + for (i = 0; i < WCD9335_SLIM_NUM_PORT_REG; i++) + regmap_write(wcd->if_regmap, WCD9335_SLIM_PGD_PORT_INT_EN0 + i, + 0x00); +} + static void wcd9335_cdc_sido_ccl_enable(struct wcd9335_codec *wcd, bool ccl_flag) { @@ -4878,6 +4888,7 @@ static void wcd9335_codec_remove(struct snd_soc_component *comp) struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); wcd_clsh_ctrl_free(wcd->clsh_ctrl); + wcd9335_teardown_irqs(wcd); } static int wcd9335_codec_set_sysclk(struct snd_soc_component *comp, -- 2.30.2