From: Dan Carpenter Date: Fri, 23 May 2025 16:07:58 +0000 (+0300) Subject: drm/nouveau/tegra: Fix error pointer vs NULL return in nvkm_device_tegra_resource_addr() X-Git-Tag: v6.16-rc1~144^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8bb3ed3197966fb60bedcbdc126d2bd5bc0a77f;p=thirdparty%2Flinux.git drm/nouveau/tegra: Fix error pointer vs NULL return in nvkm_device_tegra_resource_addr() The nvkm_device_tegra_resource() function returns a mix of error pointers and NULL. The callers only expect it to return NULL on error. Change it to only return NULL. Fixes: 76b8f81a5b92 ("drm/nouveau: improve handling of 64-bit BARs") Signed-off-by: Dan Carpenter Reviewed-by: Timur Tabi Signed-off-by: Dave Airlie Link: https://lore.kernel.org/dri-devel/334404bdf60765cb5a8e855a74c688bc537531ee.camel@nvidia.com/T/#t --- diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c index 0ca2dfe996764..114e50ca18270 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c @@ -196,7 +196,7 @@ nvkm_device_tegra_resource(struct nvkm_device *device, enum nvkm_bar_id bar) case NVKM_BAR1_FB : idx = 1; break; default: WARN_ON(1); - return ERR_PTR(-EINVAL); + return NULL; } return platform_get_resource(tdev->pdev, IORESOURCE_MEM, idx);