lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[155/272] ASoC: Fix AC97 registration unwind
    2.6.37-stable review patch.  If anyone has any objections, please let us know.

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

    From: Mark Brown <broonie@opensource.wolfsonmicro.com>

    commit 7d8316df44053687625eef792d53b3ac62e82248 upstream.

    soc_unregister_ac97_dai_link() takes a CODEC as an argument, not a
    rtd like the registration function, so give it what it's looking for.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Reported-by: Mike Frysinger <vapier.adi@gmail.com>
    Acked-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/soc/soc-core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/sound/soc/soc-core.c
    +++ b/sound/soc/soc-core.c
    @@ -1623,7 +1623,7 @@ static void snd_soc_instantiate_card(str
    if (ret < 0) {
    printk(KERN_ERR "asoc: failed to register AC97 %s\n", card->name);
    while (--i >= 0)
    - soc_unregister_ac97_dai_link(&card->rtd[i]);
    + soc_unregister_ac97_dai_link(card->rtd[i].codec);
    goto probe_dai_err;
    }
    }



    \
     
     \ /
      Last update: 2011-02-16 02:27    [W:0.030 / U:89.436 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site