lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0178/1017] media: davinci: vpif: fix unbalanced runtime PM enable
    Date
    From: Johan Hovold <johan@kernel.org>

    commit d42b3ad105b5d3481f6a56bc789aa2b27aa09325 upstream.

    Make sure to disable runtime PM before returning on probe errors.

    Fixes: 479f7a118105 ("[media] davinci: vpif: adaptions for DT support")
    Cc: stable@vger.kernel.org
    Cc: Kevin Hilman <khilman@baylibre.com>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/platform/davinci/vpif.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    --- a/drivers/media/platform/davinci/vpif.c
    +++ b/drivers/media/platform/davinci/vpif.c
    @@ -428,6 +428,7 @@ static int vpif_probe(struct platform_de
    static struct resource *res_irq;
    struct platform_device *pdev_capture, *pdev_display;
    struct device_node *endpoint = NULL;
    + int ret;

    vpif_base = devm_platform_ioremap_resource(pdev, 0);
    if (IS_ERR(vpif_base))
    @@ -456,8 +457,8 @@ static int vpif_probe(struct platform_de
    res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
    if (!res_irq) {
    dev_warn(&pdev->dev, "Missing IRQ resource.\n");
    - pm_runtime_put(&pdev->dev);
    - return -EINVAL;
    + ret = -EINVAL;
    + goto err_put_rpm;
    }

    pdev_capture = devm_kzalloc(&pdev->dev, sizeof(*pdev_capture),
    @@ -491,6 +492,12 @@ static int vpif_probe(struct platform_de
    }

    return 0;
    +
    +err_put_rpm:
    + pm_runtime_put(&pdev->dev);
    + pm_runtime_disable(&pdev->dev);
    +
    + return ret;
    }

    static int vpif_remove(struct platform_device *pdev)

    \
     
     \ /
      Last update: 2022-09-17 16:20    [W:4.667 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site