lkml.org 
[lkml]   [2019]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.1 30/51] ASoC: Intel: cht_bsw_rt5672: fix kernel oops with platform_name override
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ Upstream commit 9bbc799318a34061703f2a980e2b6df7fc6760f0 ]

    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: f403906da05cd ("ASoC: Intel: cht_bsw_rt5672: 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/cht_bsw_rt5672.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
    index 3d5a2b3a06f0..87ce3857376d 100644
    --- a/sound/soc/intel/boards/cht_bsw_rt5672.c
    +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
    @@ -425,6 +425,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
    }

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

    ret_val = snd_soc_fixup_dai_links_platform_name(&snd_soc_card_cht,
    @@ -442,7 +443,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
    snd_soc_card_set_drvdata(&snd_soc_card_cht, drv);

    /* register the soc card */
    - snd_soc_card_cht.dev = &pdev->dev;
    ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_cht);
    if (ret_val) {
    dev_err(&pdev->dev,
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-06-26 05:51    [W:4.258 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site