Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3096488ybj; Mon, 23 Sep 2019 14:47:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqxG5vrgHXUvirnJ0IDMM1WyvcfioZlCkYMfvdDlw+UA7adP6dRznnnW6Uu1FinSSSiprg+W X-Received: by 2002:a50:8961:: with SMTP id f30mr2339879edf.144.1569275272259; Mon, 23 Sep 2019 14:47:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569275272; cv=none; d=google.com; s=arc-20160816; b=04DFpVEnbYfFOG0zN8KqyD0z9Mt6AsENZL5nptxmbT93Lu08gSQcQL5XoVVTdRJxiM aTH4+rlvKqWKbmbpb0oklEhIYEgoYnOLH73QjxocJNEyzJb8tfnKzP5RFEavCksbGLQ0 kNXSO2tqSwmxozbGaKdpTFttGdWoRQ2e3Ic37WUm9/3W4GhY28v1XLiNpjtTASRloBTi Yu9LbsWZYM8UT7bp6rlealC9XD4jHBHJKk1yB+yKQ+haWyk/LOaWju48KPOlpC5/L3rw SfWg0SjEJcWo2VFWJepeaCOhNgEUg0oElPtmKLw3tLmftpTWwXvdRvM5TLd1bDiDCL2/ hr+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7RgTQEq+ntlIfu0q83fBiCyStguxSDSk1S/OREjmHZg=; b=vwFnWaT43SmHyEzAL/LD942fd7dTMBoITv6w609GpJiB+Fow4jABtoYFMsL9PZFz9W fGRlND8JOhfYtSmBB/TDpc2Q9Ro84YTgl/g30wyPuq2LiicpXSgd07xKGe6Y+4GxzD9n ofFJUoa9m+XJkqbDxpuDN0NbhKkiZ0LmIpndPyyH5QCAx32WaYClYv78H1lvDXxG3lcF DX8p1OEJ6+/J6HSiM1GDCgZTwPE5keLKF0ggttD0kCag8sPp6HWHzzDGbWjdyCvfPff4 JB8REXmU4pNE6hcJ/e7e3nyv2QA9zsDMctReDpEEwNbQyEYDoU9C8bBUXbfWFz3RQZrK XYOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zUCbwd4z; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u3si6892754edy.48.2019.09.23.14.47.28; Mon, 23 Sep 2019 14:47:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zUCbwd4z; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390508AbfIVSrC (ORCPT + 99 others); Sun, 22 Sep 2019 14:47:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:43250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390405AbfIVSq4 (ORCPT ); Sun, 22 Sep 2019 14:46:56 -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 2BECA206C2; Sun, 22 Sep 2019 18:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178015; bh=gzyP2iDTSZJkcDxjXtyZpYtn6CrWpPanXtKAD1JQ+j4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zUCbwd4zX9Ezq+LaoQgh4gaYhTVPDeAVbHP3c/yjlbe7aZYKkkHqaEc4W7nDiWtyx fwi/pV54orRrS0AjptA1TCBVjom9vqoURw6UpJLpDMmNPBHWKB6c+Eh67sFKHtBu70 oFBqBNbsg+CBkmygqBozXdENvtZ/c+7m0GqumXmA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Codrin Ciubotariu , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 5.3 102/203] ASoC: mchp-i2s-mcc: Fix unprepare of GCLK Date: Sun, 22 Sep 2019 14:42:08 -0400 Message-Id: <20190922184350.30563-102-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-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: Codrin Ciubotariu [ Upstream commit 988b59467b2b14523a266957affbe9eca3e99fc9 ] If hw_free() gets called after hw_params(), GCLK remains prepared, preventing further use of it. This patch fixes this by unpreparing the clock in hw_free() or if hw_params() gets an error. Fixes: 7e0cdf545a55 ("ASoC: mchp-i2s-mcc: add driver for I2SC Multi-Channel Controller") Signed-off-by: Codrin Ciubotariu Link: https://lore.kernel.org/r/20190820162411.24836-2-codrin.ciubotariu@microchip.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/atmel/mchp-i2s-mcc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sound/soc/atmel/mchp-i2s-mcc.c b/sound/soc/atmel/mchp-i2s-mcc.c index 8272915fa09b9..ab7d5f98e759e 100644 --- a/sound/soc/atmel/mchp-i2s-mcc.c +++ b/sound/soc/atmel/mchp-i2s-mcc.c @@ -670,8 +670,13 @@ static int mchp_i2s_mcc_hw_params(struct snd_pcm_substream *substream, } ret = regmap_write(dev->regmap, MCHP_I2SMCC_MRA, mra); - if (ret < 0) + if (ret < 0) { + if (dev->gclk_use) { + clk_unprepare(dev->gclk); + dev->gclk_use = 0; + } return ret; + } return regmap_write(dev->regmap, MCHP_I2SMCC_MRB, mrb); } @@ -710,9 +715,13 @@ static int mchp_i2s_mcc_hw_free(struct snd_pcm_substream *substream, regmap_write(dev->regmap, MCHP_I2SMCC_CR, MCHP_I2SMCC_CR_CKDIS); if (dev->gclk_running) { - clk_disable_unprepare(dev->gclk); + clk_disable(dev->gclk); dev->gclk_running = 0; } + if (dev->gclk_use) { + clk_unprepare(dev->gclk); + dev->gclk_use = 0; + } } return 0; -- 2.20.1