Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1881568ybz; Thu, 30 Apr 2020 07:09:23 -0700 (PDT) X-Google-Smtp-Source: APiQypKyITyHQMbgddKY/MCkA9Ff2AFNEF5MDxyIl+uSaErH51LOq3gexDFG0RxdaHJHMq7Al8wL X-Received: by 2002:a17:907:20ce:: with SMTP id qq14mr2739180ejb.10.1588255763475; Thu, 30 Apr 2020 07:09:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588255763; cv=none; d=google.com; s=arc-20160816; b=WxepMO/xw9C1OoWXh7u8tjBKdZXm6iziKpnD8CMhyD4r3NN4hdi7OTFBeQHvNWqG8y 4ugZGEn7U4ZizTbPiD+I5T5BG/r5RuvcfZrmj55XLj5HeDeNNi56mZJNZcBmhEG5qO3w rz4X6DRpa7GwAPKzk13gkwKWbdC1Xt2D9iXtbzOtA9+mUr8yjSaSisXHQfOJ2dWDg4Hz vPX0Z+ZESjhPmWetk8E/vcwES1uMrv6bSBQbmBxJkYoPdEerUzArlFfGFXS8I0zj2Yz1 kvI2mPBcluM8rAYhBJZfbu3hx/ZZd3vK5fc3cl4RIszSybrW34Xo8bPCLtCQ3elPgdTo yn+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=rIYU6GjW1XGFe7Sv6Q76PuKQm97T+sS6kKzLDYTt9pQ=; b=gnH79qLSzrREWrCv65jpC8G/xuqnAPqTiC6GdnKerFI7QQu0syGd24nmUV7Acpqb92 wk3pvu9hHDglIKcaO8XFv+8YhoSjyAG7BpWjhyivX3MJPZc2PG5ochetpAHam2SV2RDN 6NOjiuSdFxegVk83pdfIPYz62OP/gSopPJj/T0KkObU4PRXnVoYRtHId1s05jueoTOND 9NLBk/687u6WWNORbzO/WJ9Bgowz04ay+zNZ7+WTRc3sDcdV8MYXFbDAUiXX/JTVClXB uIHJGGFxEMh9o9IZIcNkASgRhogmd57GrmbW9yqZTGOv2yna/NFPqBVSP9hoSis5+35e D0qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YSMFJE9O; 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 d24si5371945edy.387.2020.04.30.07.08.57; Thu, 30 Apr 2020 07:09:23 -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=YSMFJE9O; 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 S1728817AbgD3OHC (ORCPT + 99 others); Thu, 30 Apr 2020 10:07:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:34124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728491AbgD3Nwp (ORCPT ); Thu, 30 Apr 2020 09:52:45 -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 484EC208D6; Thu, 30 Apr 2020 13:52:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254765; bh=yVDzDf7BPjN8V3Q1sj6RasbrxByVjWam1uXEnqFNqCI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YSMFJE9OiX3uoaACvAsghtvRXNeshOFE856YUdaLMBtM+opDBhu3E2HPefVXnILN2 j2kmmYw0Kjg+lgacxxXoDGNl0vauE33NgpDQ2T9FTjegxEILXOvIrPFtqdFDFimnmo ky3sZoKvPckTAyutniKwxh24nuMwS9HL3lgaN3Ho= 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.4 23/57] ASoC: stm32: sai: fix sai probe Date: Thu, 30 Apr 2020 09:51:44 -0400 Message-Id: <20200430135218.20372-23-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: 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