lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 242/757] ASoC: fsl: imx-es8328: add missing put_device() call in imx_es8328_probe()
    Date
    From: Yu Kuai <yukuai3@huawei.com>

    [ Upstream commit e525db7e4b44c5b2b5aac0dad24e23cb58c54d22 ]

    if of_find_device_by_node() succeed, imx_es8328_probe() doesn't have
    a corresponding put_device(). Thus add a jump target to fix the exception
    handling for this function implementation.

    Fixes: 7e7292dba215 ("ASoC: fsl: add imx-es8328 machine driver")
    Signed-off-by: Yu Kuai <yukuai3@huawei.com>
    Link: https://lore.kernel.org/r/20200825130224.1488694-1-yukuai3@huawei.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/fsl/imx-es8328.c | 12 +++++++-----
    1 file changed, 7 insertions(+), 5 deletions(-)

    diff --git a/sound/soc/fsl/imx-es8328.c b/sound/soc/fsl/imx-es8328.c
    index 15a27a2cd0cae..fad1eb6253d53 100644
    --- a/sound/soc/fsl/imx-es8328.c
    +++ b/sound/soc/fsl/imx-es8328.c
    @@ -145,13 +145,13 @@ static int imx_es8328_probe(struct platform_device *pdev)
    data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
    if (!data) {
    ret = -ENOMEM;
    - goto fail;
    + goto put_device;
    }

    comp = devm_kzalloc(dev, 3 * sizeof(*comp), GFP_KERNEL);
    if (!comp) {
    ret = -ENOMEM;
    - goto fail;
    + goto put_device;
    }

    data->dev = dev;
    @@ -182,12 +182,12 @@ static int imx_es8328_probe(struct platform_device *pdev)
    ret = snd_soc_of_parse_card_name(&data->card, "model");
    if (ret) {
    dev_err(dev, "Unable to parse card name\n");
    - goto fail;
    + goto put_device;
    }
    ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing");
    if (ret) {
    dev_err(dev, "Unable to parse routing: %d\n", ret);
    - goto fail;
    + goto put_device;
    }
    data->card.num_links = 1;
    data->card.owner = THIS_MODULE;
    @@ -196,10 +196,12 @@ static int imx_es8328_probe(struct platform_device *pdev)
    ret = snd_soc_register_card(&data->card);
    if (ret) {
    dev_err(dev, "Unable to register: %d\n", ret);
    - goto fail;
    + goto put_device;
    }

    platform_set_drvdata(pdev, data);
    +put_device:
    + put_device(&ssi_pdev->dev);
    fail:
    of_node_put(ssi_np);
    of_node_put(codec_np);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 16:42    [W:4.052 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site