Commit 4cad2a57 authored by Tomeu Vizoso's avatar Tomeu Vizoso Committed by Rob Herring

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: default avatarChen-Yu Tsai <wens@csie.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarTomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191023122157.32067-1-tomeu.vizoso@collabora.com
parent 8ae501e2
...@@ -556,11 +556,11 @@ static int panfrost_probe(struct platform_device *pdev) ...@@ -556,11 +556,11 @@ static int panfrost_probe(struct platform_device *pdev)
return 0; return 0;
err_out2: err_out2:
pm_runtime_disable(pfdev->dev);
panfrost_devfreq_fini(pfdev); panfrost_devfreq_fini(pfdev);
err_out1: err_out1:
panfrost_device_fini(pfdev); panfrost_device_fini(pfdev);
err_out0: err_out0:
pm_runtime_disable(pfdev->dev);
drm_dev_put(ddev); drm_dev_put(ddev);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment