Commit 4cad2a57 authored Oct 23, 2019 by Tomeu Vizoso Committed by Rob Herring Oct 23, 2019

panfrost: Properly undo pm_runtime_enable when deferring a probe



When deferring the probe because of a missing regulator, we were calling
pm_runtime_disable even if pm_runtime_enable wasn't called.

Move the call to pm_runtime_disable to the right place.

Fixes: 63543079 ("drm/panfrost: Rework runtime PM initialization")
Reported-by: Chen-Yu Tsai <wens@csie.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191023122157.32067-1-tomeu.vizoso@collabora.com

parent 8ae501e2

drivers/gpu/drm/panfrost/panfrost_drv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -556,11 +556,11 @@ static int panfrost_probe(struct platform_device *pdev)
		return 0;

		err_out2:
		pm_runtime_disable(pfdev->dev);
		panfrost_devfreq_fini(pfdev);
		err_out1:
		panfrost_device_fini(pfdev);
		err_out0:
		pm_runtime_disable(pfdev->dev);
		drm_dev_put(ddev);
		return err;
		}

Admin message