Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9278144pxu; Mon, 28 Dec 2020 11:11:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJyYkwYJkIFINjvnZeJ/br0RMIAnqr4kfgzjJjE4Wk1NVfs9L+hwdC1Tghvei9Lwo/YMo3v+ X-Received: by 2002:a17:906:705:: with SMTP id y5mr41384074ejb.428.1609182691099; Mon, 28 Dec 2020 11:11:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609182691; cv=none; d=google.com; s=arc-20160816; b=kwI/O9U9yGJvuVZoPiMaz74QSZ0y9eoMz0N+tbunL4KKGoWQnVoJfpnfkkdeGf6gv4 2P+8Bf8wjGL9fnQbpXg1i9I0R+8CDDj7WlB1khL1SnrAisaTR2fW00Ggivyi8nv/CkBz bGBzdDvmEGnFY3VWX/Xr/L0mKRw/zTwVRLpUV8YO9Hshrr83VRzNDGGBRIWrOC9mvGU1 Ib9C5e/Vs4Is8dziHo1kLFwwUqRpe9RdY0uVZlVE+mhBFmc2IcAojULWc5TITnhFGQqE nXBq12jr3dd6kSJ2XajJ0MThPkuLIm/5DKRYJ6IvYNVA3jzsRNf97v6MQ6NbOejZI+K6 4LhQ== 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=38i62CQwaK8EnOgBvwFPQE9BlC+PnTB5L4626XX+Tqo=; b=EkoHclSVM94RXFzAbMOrf4tjV5sfgPizJgqr5/D/N+Msqc8O/6ezYUuk2O0dhDFtLL 0u9ps/9yyyrq+jMZnxNlcjdge7k35uc6eJ5fF7xyzbwqsKpOYFNtW0T8/ZUwCQ82Q32x fwSYotGhPy8I9v49ZeZB6XrcY5ryw2+2jvTn7XX+v4RjF9xAt4Y+60rHjemYfEYAkfI8 51yhM6kFCeUJfBda6pUuzaQKQiKF5bWAObf2PifQ2zVkVKA0xeIBrWjLERgxbZJex74N yqVTArnBIAsPaeErSToOnjH3ht4ElKY3boHJSd7EVBEiYmIwkOaMGwa/4gq1vQ2eY2ox wFwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cLU13LET; 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 hb44si19382481ejc.150.2020.12.28.11.11.08; Mon, 28 Dec 2020 11:11:31 -0800 (PST) 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=cLU13LET; 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 S2405075AbgL1Nyq (ORCPT + 99 others); Mon, 28 Dec 2020 08:54:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:55658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407397AbgL1NyG (ORCPT ); Mon, 28 Dec 2020 08:54:06 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8B186206D4; Mon, 28 Dec 2020 13:53:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609163631; bh=80Df07jw8u0rPfckof6unHZA8g2+cWiNH7Dx5mLknAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cLU13LETZdnkqBpR1ZgqYOZgduJ7YJ894L2kYtzz89q/fw9DbXdq/5/R4RoSC9YxY G+sBU3VAh6sAMED6Pm+DnlswNc+Pel/Ib1u1Re5wvo+pqROKqg35wK4McTHS7Pey/m cwN5NRfvvQgdVHXL9vq8FUceN9iU0zJ6tnG6iwyc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai , Mark Brown Subject: [PATCH 5.4 354/453] ASoC: cx2072x: Fix doubly definitions of Playback and Capture streams Date: Mon, 28 Dec 2020 13:49:50 +0100 Message-Id: <20201228124954.239669976@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124937.240114599@linuxfoundation.org> References: <20201228124937.240114599@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: Takashi Iwai commit 0d024a8bec084205fdd9fa17479ba91f45f85db3 upstream. The cx2072x codec driver defines multiple DAIs with the same stream name "Playback" and "Capture". Although the current code works more or less as is as the secondary streams are never used, it still leads the error message like: debugfs: File 'Playback' in directory 'dapm' already present! debugfs: File 'Capture' in directory 'dapm' already present! Fix it by renaming the secondary streams to unique names. Fixes: a497a4363706 ("ASoC: Add support for Conexant CX2072X CODEC") Cc: Signed-off-by: Takashi Iwai Link: https://lore.kernel.org/r/20201208135154.9188-1-tiwai@suse.de Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/cx2072x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/sound/soc/codecs/cx2072x.c +++ b/sound/soc/codecs/cx2072x.c @@ -1579,7 +1579,7 @@ static struct snd_soc_dai_driver soc_cod .id = CX2072X_DAI_DSP, .probe = cx2072x_dsp_dai_probe, .playback = { - .stream_name = "Playback", + .stream_name = "DSP Playback", .channels_min = 2, .channels_max = 2, .rates = CX2072X_RATES_DSP, @@ -1591,7 +1591,7 @@ static struct snd_soc_dai_driver soc_cod .name = "cx2072x-aec", .id = 3, .capture = { - .stream_name = "Capture", + .stream_name = "AEC Capture", .channels_min = 2, .channels_max = 2, .rates = CX2072X_RATES_DSP,