Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1880273ybz; Thu, 30 Apr 2020 07:08:14 -0700 (PDT) X-Google-Smtp-Source: APiQypJBDKXnbrL3rU264W6h/iKEj6RbtVRLT4aunq4oFqdj2l9es5o8OMv8jIJ6WrJu4gPLazID X-Received: by 2002:a17:906:2503:: with SMTP id i3mr2662729ejb.293.1588255693946; Thu, 30 Apr 2020 07:08:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588255693; cv=none; d=google.com; s=arc-20160816; b=VHK7HMp/PAVZco7zo9oqkjQmMJhvYwDwIGaIcVaBzAaIz7CEf+pBdbjRV7jY9xqRg5 Fynki/+ru9pvBN3uerzX2Kb2rq4Xija5nwTLZjSZjLDKgNGvHH/n0/V0Xk7wrWILdh0n ISEsAx2dwr8EQ8ISyhlxZMb/amh3hDAMg6Gl8ZS/4vl5a5QUYuUcQ/7nXYmp4KalpgUD belVkyzE2Ug9ENQ2ugvPTKfivjcQ1bgcl+RNkNU/OlBRNFfo9pgXFfw7lpz5MRIJwfae 9hw5ml1PLdkJYxjS9eUsXpixUaqzDHo8ACEwXRFFl3dRlRX6Q+ENxH+eBOyyYb38bFiv hyYA== 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=P/MqzjpLWP/lr3glDrOhm7KerAwqF3j1kTp1Ees/tbc=; b=0FWXomIuvTMvEAka/Z35l2fCEFs5+kR/d7RW7jsBZMoE/XPi0t80IIVpiNXIglVv6h 9mxGOwmuLatgQNaIDQh5mCVWXAIXU7XnavneyFck07zzGFWTQMJK15JiBu+uVH7SresR wupeUm+ft2vri8kbIR9nnuirdxr9dwkVJFoCyf1dM2i8r0tScK5ooEL4nY/NKOBTEeuk WxxULTAZsuaDoyP9Zg9EUaYX7nnlNAYJcdNR7iv/i8yh2pknAH2IPTU+ioWGZZ2G3iif c6jIZPiS4i1sM4QMvXl0NgXex6qTzPbP3JHffwA/t6fqfJ1A+6jeXCCn6FaGzFxgsHTL Qtig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=M1CDCvIZ; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id da12si5340429edb.439.2020.04.30.07.07.44; Thu, 30 Apr 2020 07:08:13 -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=@kernel.org header.s=default header.b=M1CDCvIZ; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729516AbgD3OFH (ORCPT + 99 others); Thu, 30 Apr 2020 10:05:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:34544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728599AbgD3NxD (ORCPT ); Thu, 30 Apr 2020 09:53:03 -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 61BFF208D5; Thu, 30 Apr 2020 13:53:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254783; bh=dOA8n0tJWKHGY0ZgO52Pl8gFZpj1lU4mNQIpj3C22lk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M1CDCvIZyX+tx7W1ErS9kDZNWFUJO6E4QaKgHV8oLXOyNYA9ZEH3Byk6xZJwYjJzv YnnznaqliV1miJKBq/rSnuJ7Xkgt/Rr4zu+Aq6DVTUw2Xx/wRBkeqlJieaxyr52axH qnCb+jL8yoE73YWaAgZnHnCJLHlD8WAp90v87USE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shengjiu Wang , Charles Keepax , Mark Brown , Sasha Levin , patches@opensource.wolfsonmicro.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 39/57] ASoC: wm8960: Fix wrong clock after suspend & resume Date: Thu, 30 Apr 2020 09:52:00 -0400 Message-Id: <20200430135218.20372-39-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135218.20372-1-sashal@kernel.org> References: <20200430135218.20372-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: Shengjiu Wang [ Upstream commit 1e060a453c8604311fb45ae2f84f67ed673329b4 ] After suspend & resume, wm8960_hw_params may be called when bias_level is not SND_SOC_BIAS_ON, then wm8960_configure_clocking is not called. But if sample rate is changed at that time, then the output clock rate will be not correct. So judgement of bias_level is SND_SOC_BIAS_ON in wm8960_hw_params is not necessary and it causes above issue. Fixes: 3176bf2d7ccd ("ASoC: wm8960: update pll and clock setting function") Signed-off-by: Shengjiu Wang Acked-by: Charles Keepax Link: https://lore.kernel.org/r/1587468525-27514-1-git-send-email-shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm8960.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 55112c1bba5e7..6cf0f6612bdaf 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -860,8 +860,7 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream, wm8960->is_stream_in_use[tx] = true; - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON && - !wm8960->is_stream_in_use[!tx]) + if (!wm8960->is_stream_in_use[!tx]) return wm8960_configure_clocking(component); return 0; -- 2.20.1