lkml.org 
[lkml]   [2015]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.0 059/148] ASoC: dapm: Modify widget stream name according to prefix
    Date
    4.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Koro Chen <koro.chen@mediatek.com>

    commit fdb6eb0a12871d5bfaf266c5a0d5259a5437a72f upstream.

    When there is prefix specified, currently we will add this prefix in
    widget->name, but not in widget->sname.
    it causes failure at snd_soc_dapm_link_dai_widgets:

    if (!w->sname || !strstr(w->sname, dai_w->name))

    because dai_w->name has prefix added, but w->sname does not.
    We should also add prefix for stream name

    Signed-off-by: Koro Chen <koro.chen@mediatek.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/soc-dapm.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    --- a/sound/soc/soc-dapm.c
    +++ b/sound/soc/soc-dapm.c
    @@ -3074,11 +3074,16 @@ snd_soc_dapm_new_control(struct snd_soc_
    }

    prefix = soc_dapm_prefix(dapm);
    - if (prefix)
    + if (prefix) {
    w->name = kasprintf(GFP_KERNEL, "%s %s", prefix, widget->name);
    - else
    + if (widget->sname)
    + w->sname = kasprintf(GFP_KERNEL, "%s %s", prefix,
    + widget->sname);
    + } else {
    w->name = kasprintf(GFP_KERNEL, "%s", widget->name);
    -
    + if (widget->sname)
    + w->sname = kasprintf(GFP_KERNEL, "%s", widget->sname);
    + }
    if (w->name == NULL) {
    kfree(w);
    return NULL;



    \
     
     \ /
      Last update: 2015-06-03 14:41    [W:3.444 / U:0.564 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site