From: Johan Hovold <johan@xxxxxxxxxx> 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@xxxxxxxxxxxxxxx Cc: Kevin Hilman <khilman@xxxxxxxxxxxx> Signed-off-by: Johan Hovold <johan@xxxxxxxxxx> Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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) Patches currently in stable-queue which might be from johan@xxxxxxxxxx are queue-5.17/usb-serial-pl2303-add-ibm-device-ids.patch queue-5.17/usb-serial-simple-add-nokia-phone-driver.patch queue-5.17/firmware-sysfb-fix-platform-device-leak-in-error-path.patch queue-5.17/media-davinci-vpif-fix-unbalanced-runtime-pm-enable.patch queue-5.17/media-davinci-vpif-fix-unbalanced-runtime-pm-get.patch queue-5.17/greybus-svc-fix-an-error-handling-bug-in-gb_svc_hello.patch queue-5.17/usb-serial-pl2303-fix-gs-type-detection.patch queue-5.17/media-davinci-vpif-fix-use-after-free-on-driver-unbind.patch