lkml.org 
[lkml]   [2019]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.3 175/203] ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set
    Date
    From: Peter Ujfalusi <peter.ujfalusi@ti.com>

    [ 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 <peter.ujfalusi@ti.com>
    Reported-by: Arthur She <arthur.she@linaro.org>
    Link: https://lore.kernel.org/r/20190906055524.7393-1-peter.ujfalusi@ti.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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
    \
     
     \ /
      Last update: 2019-09-22 21:33    [W:3.631 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site