From patchwork Thu Oct 3 15:53:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 175108 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp534513ill; Thu, 3 Oct 2019 09:13:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqysV0HFBZgr1o9NaiGfE9+oqmdb5oVESjvz8FhVEHtiwKVsx/THxGvJMT/t09UaUeVHSVUO X-Received: by 2002:a17:906:5284:: with SMTP id c4mr8585980ejm.39.1570119205867; Thu, 03 Oct 2019 09:13:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570119205; cv=none; d=google.com; s=arc-20160816; b=ifUYrANG6eFrJvCUqCP+udVlFH3z0m0RJspDNDSmZy71yhLhW/hfw6GhOGFNcNRWFo h78RsAUraxN38vHZqELB6i2Ja2RnPNMjMlW5aop5A1S72LbxDaWKnCAfnerI5aQJM6s8 4NnGJN+geyA4mVJDoxmoSWfHiX+JE32Sb8kbH4rL7PQZGyxrSt4mcjHxsha4NR4ytqAw UsYuJvCD4ioXgXlRQszSwz4Z4Xd5OXXZW3HEVqGxI51w+kdzmcCPqemGMNX3TMRZknL6 00tYkR+lO9JE9lPQ5vmsmOwU0VciXq7j3gsq46WJkmVtZqjdYX9lzO0dF+f49lDLc7mn v/3g== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BEU6QeIKzl0vKlHeLIblsMfcYhssiP7hdL5yZcFFGs8=; b=ywCJZDQVjd75WGxhzmxNWL+eM+gxZxjs7VHmeO7DgrJtSL0ZXa+13/jks8zFHnK1sF yzPT9W7Fn95lWKZGMkCaPhOQigRbQlYI2vWIYoW4E4BFAfs/ZHWskkK/DKT38qUSx6gI nKFMMoYSqpyhrKlprdKKs1ZmVmC44wTXouimD873SobuMrV9/e0LGRY/hKeqOD7Cw5vf 1AB6nswrPxf7dvccwlf+w71UV+3L87365UoDJMHcp94RHSuYFdGs5HnQl1Xs4yEm5vvw cjjhFRYblMEtTdpMZwjnYbAYOhzmnMWRZ93FTSy/Ls4t6R2nwPcSBcokkSl35m2Q95Bx bA9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wmMEQRT5; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gh3si1390390ejb.306.2019.10.03.09.13.25; Thu, 03 Oct 2019 09:13:25 -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=wmMEQRT5; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388300AbfJCQNY (ORCPT + 27 others); Thu, 3 Oct 2019 12:13:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:36038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388261AbfJCQNW (ORCPT ); Thu, 3 Oct 2019 12:13:22 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A923121783; Thu, 3 Oct 2019 16:13:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570119201; bh=DK+VYKzLxLOxqlDf2LOXe0BiTUa7g4axbqL/DscNXnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wmMEQRT5h034JiiEFKvIsiO5Ju3liOAd0/xozrXXx3SdpeVxAxzGOeRxw+C9SFwBQ eIVb91KqjFsNMwyF9e/M1xUokVPlu6QhFvq1l9dsidXTttK4PkXmlXkhGGGvK0phyd hkZAO+2mRHMj78Y0ZyZ53zfQGLnWK7bCwgOWj3YQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Arthur She , Mark Brown , Sasha Levin Subject: [PATCH 4.14 126/185] ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set Date: Thu, 3 Oct 2019 17:53:24 +0200 Message-Id: <20191003154506.356128880@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154437.541662648@linuxfoundation.org> References: <20191003154437.541662648@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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(+) -- 2.20.1 diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index d53786498b612..052778c6afad6 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -311,6 +311,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;