Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1888915ybz; Thu, 30 Apr 2020 07:15:49 -0700 (PDT) X-Google-Smtp-Source: APiQypJ81g7QM3VOj22/51REPDOblWmgwpqAkLjS7EDpGMlN+QUHNhWb0yT1lOMHLQNsVa/JGt17 X-Received: by 2002:a17:906:4995:: with SMTP id p21mr2771671eju.19.1588256149628; Thu, 30 Apr 2020 07:15:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588256149; cv=none; d=google.com; s=arc-20160816; b=jQKIijTVSDHdTPLepxbcb0T7sCdePTvEuvADfY7W8GPJqz6m+O2EtHHH3m19Cxz2bB sr8pyqkaHtFiBrzq4VZZMrVQqRgJkgNA4agUl/30ymxTdHOWvbawVDIQQYyltvGDHHWf bzZV5Xwk11xEXyeuhscK2/pyrDMS5UZC6rX6pdcH/+jbnGhGCp5BEtVuy6sXrjWizq0g aLdjpI5Jiz7XGUyy/KCivTZrsKXKYJlxexC6ukRCLyOBV9V77+HlRfncsBskEJ6aFvUi +UPJ1HnXroA4gs4hEmA1Eh1UU6qlduC1GzNx27qu8wLny4LXwZdwAUoZcrypb7ZAJL5u GP9w== 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=rIYU6GjW1XGFe7Sv6Q76PuKQm97T+sS6kKzLDYTt9pQ=; b=bhOMsbm+RvLCr35OfYmyS+Y316d2x2NbZ87nNuzYaINd6YpDPWAgILXxgx5RSgN7dB VnS9aBGZgOnk3TNIOHvuZBHhlMXEtTYgT5CoiDyJWbja5IU1Rwv0uwAu79s+Vt4JpA/F funUWXJbhxv4kPNeyhOh5VjlxdtonK6DrIaoFL+HDs+WBidElVZY5tg6j53ZFOKprbeH UgwreGhy9tVVVV3mj48pp9ejA1FwviCzblkcnhmxVC+TuTCyihIRMVKyjbXXfGihviwf /q1nCS8+2nDSLlA8FNBE2lrxBS0ByIKEJEyw/0L6IZTJDjmiT3Z4baDWp3IROW5KQ6Ue J6uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=w4OHDPD8; 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 q13si5668884eds.115.2020.04.30.07.15.25; Thu, 30 Apr 2020 07:15:49 -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=w4OHDPD8; 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 S1728965AbgD3OLY (ORCPT + 99 others); Thu, 30 Apr 2020 10:11:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:59668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728049AbgD3NvZ (ORCPT ); Thu, 30 Apr 2020 09:51:25 -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 851EF2082E; Thu, 30 Apr 2020 13:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254685; bh=yVDzDf7BPjN8V3Q1sj6RasbrxByVjWam1uXEnqFNqCI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w4OHDPD8gFHxVnTbmLEhBYaQIzF0wza76jwZWX9dq28S7y70bfndBx8nq/D0LWHMM spnvQoAvAOZqQGWpEem3NqgpJRqU2gso/B8CHMtlUI7q7dRXRbTy9y/HpdTfOFhLC1 BRmdIBt+nDT8wnVK8XedN+3hp2EePIk61VoILnWU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Olivier Moysan , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.6 36/79] ASoC: stm32: sai: fix sai probe Date: Thu, 30 Apr 2020 09:50:00 -0400 Message-Id: <20200430135043.19851-36-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135043.19851-1-sashal@kernel.org> References: <20200430135043.19851-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: Olivier Moysan [ Upstream commit e2bcb65782f91390952e849e21b82ed7cb05697f ] pcm config must be set before snd_dmaengine_pcm_register() call. Fixes: 0d6defc7e0e4 ("ASoC: stm32: sai: manage rebind issue") Signed-off-by: Olivier Moysan Link: https://lore.kernel.org/r/20200417142122.10212-1-olivier.moysan@st.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/stm/stm32_sai_sub.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index d3259de43712b..7e965848796c3 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1543,6 +1543,9 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) return ret; } + if (STM_SAI_PROTOCOL_IS_SPDIF(sai)) + conf = &stm32_sai_pcm_config_spdif; + ret = snd_dmaengine_pcm_register(&pdev->dev, conf, 0); if (ret) { dev_err(&pdev->dev, "Could not register pcm dma\n"); @@ -1551,15 +1554,10 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) ret = snd_soc_register_component(&pdev->dev, &stm32_component, &sai->cpu_dai_drv, 1); - if (ret) { + if (ret) snd_dmaengine_pcm_unregister(&pdev->dev); - return ret; - } - - if (STM_SAI_PROTOCOL_IS_SPDIF(sai)) - conf = &stm32_sai_pcm_config_spdif; - return 0; + return ret; } static int stm32_sai_sub_remove(struct platform_device *pdev) -- 2.20.1