Commit d42b3ad1 authored by Johan Hovold's avatar Johan Hovold Committed by Mauro Carvalho Chehab
Browse files

media: davinci: vpif: fix unbalanced runtime PM enable 



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

Fixes: 479f7a11 ("[media] davinci: vpif: adaptions for DT support")
Cc: stable@vger.kernel.org
Cc: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 4a321de2

drivers/media/platform/davinci/vpif.c

+9 −2
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ static int vpif_probe(struct platform_device *pdev) 
	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_device *pdev) 
	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_device *pdev) 
	}



	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)