lkml.org 
[lkml]   [2016]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 18/54] ASoC: dapm: Make sure we have a card when displaying component widgets
    Date
    3.19.8-ckt21 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Mark Brown <broonie@kernel.org>

    commit 47325078f2a3e543150e7df967e45756b2fff7ec upstream.

    The dummy component is reused for all cards so we special case and don't
    bind it to any of them. This means that code like that displaying the
    component widgets that tries to look at the card will crash. In the
    future we will fix this by ensuring that the dummy component looks like
    other components but that is invasive and so not suitable for a fix.
    Instead add a special case check here.

    Reported-by: Harry Pan <harry.pan@intel.com>
    Suggested-by: Lars-Peter Clausen <lars@metafoo.de>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    [ kamal: backport to 4.2-stable ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    sound/soc/soc-dapm.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
    index ec3cc88..0ffd634 100644
    --- a/sound/soc/soc-dapm.c
    +++ b/sound/soc/soc-dapm.c
    @@ -2067,6 +2067,13 @@ static ssize_t dapm_widget_show_codec(struct snd_soc_codec *codec, char *buf)
    int count = 0;
    char *state = "not set";

    + /* card won't be set for the dummy component, as a spot fix
    + * we're checking for that case specifically here but in future
    + * we will ensure that the dummy component looks like others.
    + */
    + if (!codec->component.card)
    + return 0;
    +
    list_for_each_entry(w, &codec->component.card->widgets, list) {
    if (w->dapm != &codec->dapm)
    continue;
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-05-10 02:41    [W:4.046 / U:1.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site