lkml.org 
[lkml]   [2019]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.1 32/96] ASoC: Intel: bytcht_es8316: fix kernel oops with platform_name override
    Date
    [ Upstream commit 79136a016add1acb690fe8d96be50dd22a143d26 ]

    The platform override code uses devm_ functions to allocate memory for
    the new name but the card device is not initialized. Fix by moving the
    init earlier.

    Fixes: e4bc6b1195f64 ("ASoC: Intel: bytcht_es8316: platform name fixup support")
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/intel/boards/bytcht_es8316.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c
    index d2a7e6ba11ae..1c686f83220a 100644
    --- a/sound/soc/intel/boards/bytcht_es8316.c
    +++ b/sound/soc/intel/boards/bytcht_es8316.c
    @@ -471,6 +471,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
    }

    /* override plaform name, if required */
    + byt_cht_es8316_card.dev = dev;
    platform_name = mach->mach_params.platform;

    ret = snd_soc_fixup_dai_links_platform_name(&byt_cht_es8316_card,
    @@ -538,7 +539,6 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
    (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "mono" : "stereo",
    mic_name[BYT_CHT_ES8316_MAP(quirk)]);
    byt_cht_es8316_card.long_name = long_name;
    - byt_cht_es8316_card.dev = dev;
    snd_soc_card_set_drvdata(&byt_cht_es8316_card, priv);

    ret = devm_snd_soc_register_card(dev, &byt_cht_es8316_card);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-07-08 17:38    [W:2.878 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site