From: Boris Brezillon Date: Mon, 14 Apr 2025 13:01:20 +0000 (+0200) Subject: drm/panthor: Fix the panthor_gpu_coherency_init() error path X-Git-Tag: v6.16-rc1~144^2~16^2~71 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=938aaed555f3add76531cd204e2d4128ecb84ace;p=thirdparty%2Fkernel%2Flinux.git drm/panthor: Fix the panthor_gpu_coherency_init() error path The panthor_gpu_coherency_init() call has been moved around, but the error path hasn't been adjusted accordingly. Make sure we undo what has been done before this call in case of failure. Fixes: 7d5a3b22f5b5 ("drm/panthor: Call panthor_gpu_coherency_init() after PM resume()") Reported-by: Dan Carpenter Closes: https://lore.kernel.org/dri-devel/4da470aa-4f84-460e-aff8-dabc8cc4da15@stanley.mountain/T/#t Reviewed-by: Steven Price Reviewed-by: Liviu Dudau Link: https://lore.kernel.org/r/20250414130120.581274-1-boris.brezillon@collabora.com Signed-off-by: Boris Brezillon --- diff --git a/drivers/gpu/drm/panthor/panthor_device.c b/drivers/gpu/drm/panthor/panthor_device.c index c73c1608d6e68..1e8811c6716df 100644 --- a/drivers/gpu/drm/panthor/panthor_device.c +++ b/drivers/gpu/drm/panthor/panthor_device.c @@ -245,7 +245,7 @@ int panthor_device_init(struct panthor_device *ptdev) ret = panthor_gpu_coherency_init(ptdev); if (ret) - return ret; + goto err_unplug_gpu; ret = panthor_mmu_init(ptdev); if (ret)