From patchwork Thu Oct 3 15:52:43 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: 175135 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp560451ill; Thu, 3 Oct 2019 09:32:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4KayKVvKa1WWbbpuqBje13jjYNmZPrOQwB315NmvliOKQTge8TqcghATuY1WdgBjhHtbP X-Received: by 2002:a17:906:d92c:: with SMTP id rn12mr8494666ejb.16.1570120350295; Thu, 03 Oct 2019 09:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570120350; cv=none; d=google.com; s=arc-20160816; b=ab6y87NoPCsgPIxTOutF3Xa1E5J80OuPT8Vi6ZGN/5YQm+3JoxxaZYX+BwktIIXx2x eD52X2jHh4SlwL+GQ/UYHQNyuoNDt9RtGUddpNpPNxDnkVLm0NcjoCklncElS26JPQxp YlSyq96iq51WPkT6Ws7kxc440SSvfZOvnj/k+jIleMkertraNbpXRgJjECQu28OJ5eoN YORKTASDW4uuHEiqlu20+Hi8/9vCTK0L7EqFSEkeKRCE9XpHaqRKi9PZXl78KAFf282P +01UDw4lzQ/zgyyAhjx1p90T4djnpWkEDM4k5RmYFVVn/XtS+LOcLD20EN98bm1+PNhy SsrA== 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=Pqcw339CMBrgFqnM2yiv3guprrWrgIh35kct79yMezU=; b=dQV0liiOreywECdW1UPCfE4P1M/RXRMYDgwOgxBdoryfez0K0H9j0thgPRBCgvc/Z3 GCRm488NDqiDUzF/Lon/6ATmuKN4FDuIwzh2501juqXJrp2XnZMOVsZLtciFh3PDeq1V DvKiUn9jUrVsxDHZs26cQ3mlx1tusz6dKx4Wmau3Cp3+IkypwyUsdcna4l/Rq0SuOHN4 yFJk9EkE5+GNDauhr8v+C366WvzuAaRp49QagFWvCq9e88W+niRuCBUskVNkhk4b0Z3m uJI6Jd7oE8K2/viahRYPWF0eB4v4MnatjbihPOpkKSCyNL3eeGcEBWDzzYFZgOEhMj6F L4AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="QcG+Bp2/"; 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 h15si1937032eda.284.2019.10.03.09.32.29; Thu, 03 Oct 2019 09:32:30 -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="QcG+Bp2/"; 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 S2391911AbfJCQcW (ORCPT + 27 others); Thu, 3 Oct 2019 12:32:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:39788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391510AbfJCQcT (ORCPT ); Thu, 3 Oct 2019 12:32:19 -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 E495B215EA; Thu, 3 Oct 2019 16:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120338; bh=5eDikgOSaSe6iEg5YcefwyC0Wju1DF4Oj1szVWREBus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QcG+Bp2/AcX0FSl/0lHaoqgzL8mPnbtZ+bjKe4P561yHNexuNJtqpIA7wIQbrCKf8 Eo4AW+2J5FwmfNq91/dF+gvacRyyYgSPM2OeAdon20rdNUve1YpO7ZC3C5ZTo+3iWq +ers22w2PPMPn5Uae3r2ki04tLkIz/olpimpOJbc= 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 5.2 185/313] ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set Date: Thu, 3 Oct 2019 17:52:43 +0200 Message-Id: <20191003154551.208360676@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@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 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;