Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1083186ybn; Tue, 24 Sep 2019 14:28:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqysgofBrsgqnho2KFH2Q7pDByPwFG/DbtRfVaFaV5vkt9wuNVsH+jUMl0Lp6kE87Zc8hbNe X-Received: by 2002:a1c:6607:: with SMTP id a7mr2736993wmc.125.1569360526709; Tue, 24 Sep 2019 14:28:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569360526; cv=none; d=google.com; s=arc-20160816; b=mopymmMqR3BLijuzk1V/W/2XNWvFVNTyBi5nZABpNEwCV0rBYJgD/gRlBuKpQm01yo nRZZWCUx/ovQ/qrv7jhtlSjXy4xPWcWx3AeuMTCxKtQLptUz7AxyzjQ5VhpBV1QD1+SP 3duKZzfXqGqvOII3Mw5+LW1NjWwbVXOL67nm2J9lxMaSP7M4o3MPiUhmr1CsqAuuF0EW trHwUyjQayiBs6Kp9dobNe6h5QpiyAb9wHA4tpohj9jThMr0Li0KqjsvHFM77bJhZ4yu O+P0NQp4LyQ6y/sHoJ1deJCM72nxO3LnYWIxK2fhNuYg9p2C4UhtBCN7DZreVvqsdKQv cxHw== 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=Pqcw339CMBrgFqnM2yiv3guprrWrgIh35kct79yMezU=; b=oPxnlpxjjyOLxxD7QLZG7+wwzfVn06WBQ5sezZf5LJCMokDhNTc5Qdl8QfrKe4SS1g nvWIgmNQO0ROnkPDFuD2zPrOEkBTsR9+lNSoiVVcXbUuUIfYbuBUORDNSM2e32G1C6gB Tk5WWqUnYyIZihMsyH+aQuNbi2R9pJ3Yh7j7eCAaKEoTesLe41fjNEWYnKUQDGebSD4S 0rkBPVLYf3Mi9ewYP5O2TsxsBzglXKfVh1EJB0qc67+Xcwx3lJJPqfA312PYFVv8A6wb 1w8NJnf4rOeZzOljcTEjeZiKUm0IhxjSF3HIljGJ67A4aF/haBUv7uxkqsKnw1KSya29 Hb2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ikvoyMk8; 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 qu18si1596697ejb.80.2019.09.24.14.28.23; Tue, 24 Sep 2019 14:28:46 -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=ikvoyMk8; 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 S2437838AbfIVTb4 (ORCPT + 99 others); Sun, 22 Sep 2019 15:31:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:45600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391698AbfIVSsj (ORCPT ); Sun, 22 Sep 2019 14:48:39 -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 5D78C21D71; Sun, 22 Sep 2019 18:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178119; bh=5eDikgOSaSe6iEg5YcefwyC0Wju1DF4Oj1szVWREBus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ikvoyMk8jHpHJTlJhJjoXmcJnUAGMSrALBWymBTrLWKanG0XH3faUfEDYvZp5JWfY xHxPCyqf6r+Uv12ZIQ4DoMedUhzkANmgh0Z/0VUbfwI/rCExWgeovFnzkS9vNeXuao r0sj2criBHzsXwDfypQpfob7+wEUbOslMCNus4cY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Ujfalusi , Arthur She , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 5.3 175/203] ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set Date: Sun, 22 Sep 2019 14:43:21 -0400 Message-Id: <20190922184350.30563-175-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: Peter Ujfalusi [ Upstream commit 2ec42f3147e1610716f184b02e65d7f493eed925 ] Some tools use the snd_pcm_info_get_name() to try to identify PCMs or for other purposes. Currently it is left empty with the dmaengine-pcm, in this case copy the pcm->id string as pcm->name. For example IGT is using this to find the HDMI PCM for testing audio on it. Signed-off-by: Peter Ujfalusi Reported-by: Arthur She Link: https://lore.kernel.org/r/20190906055524.7393-1-peter.ujfalusi@ti.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-generic-dmaengine-pcm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 748f5f641002e..d93db2c2b5270 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -306,6 +306,12 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd) if (!dmaengine_pcm_can_report_residue(dev, pcm->chan[i])) pcm->flags |= SND_DMAENGINE_PCM_FLAG_NO_RESIDUE; + + if (rtd->pcm->streams[i].pcm->name[0] == '\0') { + strncpy(rtd->pcm->streams[i].pcm->name, + rtd->pcm->streams[i].pcm->id, + sizeof(rtd->pcm->streams[i].pcm->name)); + } } return 0; -- 2.20.1