iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Properly undo pm_runtime_enable when deferring a probe

Browse Source 
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: 635430797d3f ("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
This commit is contained in:
Tomeu Vizoso 2019-10-23 14:21:57 +02:00 committed by Rob Herring
parent 8ae501e295
commit 4cad2a574d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/panfrost/panfrost_drv.c
View File

@ -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;
} }