From patchwork Thu Oct 3 15:53:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175190 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp640045ill; Thu, 3 Oct 2019 10:36:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqwK4PwArjJBPhZCGIu6OkvBUNsHlNpenWfxJlGr42zE/zMb6niYp5ZsD4AFEA53phVd5oMh X-Received: by 2002:a05:6402:1ade:: with SMTP id ba30mr10980868edb.304.1570124213532; Thu, 03 Oct 2019 10:36:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570124213; cv=none; d=google.com; s=arc-20160816; b=BKwXBMPVn5trO+qfR5D/IRJeCAsi80OgRgppjo+tK3517iv7odwEr8+wsvc3Kq80bG X4s0t66s6+o0WgwjnwPw1GxICTrGaDFv7pMDXH7FAwrjW/Q+RdFg7CHUgHDHEbjRLLiQ yKS0fNFTCIk/P7pR89771CO6milSCLqQkwQxPvZWQKxo5HNRFaCvtxa+gIzdcDL4ckQn SLVnFL6MkW3hGJxOoeMzifqgBaSCCn/ZFGj0MHFKw+xpdmY8fRyliwNivH4voq/Hw9hO 0Kvik3gFKVoSPNbo113uKitQnWJK90PS6W3+p7MMfQCT1gKsYKAO9XbgNPo4uFRbZLC/ aUIg== 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=/kzyIS0dT6+FmrjfEdREDnHKWaKQXu3Jzq6SJTHXcUE=; b=lVoSjvEqwIcxpVlmqwRF8F9I1QBR/soN1iR3hwuBvh9fMTa0YzAbSJxHVAi3MLmecX nmTHPppKcKNMdYlsJokFUrR/v3mJ6Ik3UDDaoduhNL6mwlV8N40o5qw8ib3fvJguY1Pi ngCoV2QTgctt4FwAsXaKr+DkfJtYjRtXYHVfiYpU0WqfCjGEIUv787GfD3ZYwDBwT5S+ jcyTYWWrQPx91cuC4yQieSLXpB2udQtuWmT8UpncZP8i8YMLrdahvbUANhuUb/SVIsRO 2ZxDr9KKlOMoe6Rw/Dr7IderT8sZYvH5gHC0wcdIISXC+0V6S03hXouA4xI1meQpxziE YDpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bAE5haD1; 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 q13si1615102eju.46.2019.10.03.10.36.53; Thu, 03 Oct 2019 10:36:53 -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=bAE5haD1; 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 S2388773AbfJCRgw (ORCPT + 27 others); Thu, 3 Oct 2019 13:36:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:49910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732345AbfJCQEI (ORCPT ); Thu, 3 Oct 2019 12:04:08 -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 5D1C421A4C; Thu, 3 Oct 2019 16:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118647; bh=yboTTV9U5Hi5WqFc52skmFm/H4w+dx7z0bgyguhUBWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bAE5haD1mVVI02dqS7srlHuiJcOGNx3SCA+X1dLQcI9oftP1NzNPtLqOUKvlIxRuQ eZHCMxtpgFXmExvxC1W3iINcqxIUtBEQ2mTH4Yb9EKerFnppbW7uAaWlCQhWpwM7Yb opPlaEWCCawTW8Hih9fzowscdAP6dwaVZzFQRduk= 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.9 088/129] ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set Date: Thu, 3 Oct 2019 17:53:31 +0200 Message-Id: <20191003154359.394134963@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154318.081116689@linuxfoundation.org> References: <20191003154318.081116689@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 6cef3977507ae..67d22b4baeb05 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -312,6 +312,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;