summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2015-09-03 17:39:52 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-19 14:28:38 -0800
commit233ffe57007a91dd2f517ac60aa668979c404dbd (patch)
tree93330b257d8348be5c96e3ae3c0ada56be1576de
parentfee906f035f0bd18ff12d84d58766c44a2ab0918 (diff)
downloadlinux-stable-233ffe57007a91dd2f517ac60aa668979c404dbd.tar.gz
linux-stable-233ffe57007a91dd2f517ac60aa668979c404dbd.tar.bz2
linux-stable-233ffe57007a91dd2f517ac60aa668979c404dbd.zip
drm/nouveau/pmu: do not assume a PMU is present
commit 579b7c58215329803ce184704463de09f0f310ac upstream. Some devices may not have a PMU. Avoid a NULL pointer dereference in such cases by checking whether the pointer given to nvkm_pmu_pgob() is valid. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c
index 27a79c0c3888..d95eb8659d1b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c
@@ -28,7 +28,7 @@
void
nvkm_pmu_pgob(struct nvkm_pmu *pmu, bool enable)
{
- if (pmu->func->pgob)
+ if (pmu && pmu->func->pgob)
pmu->func->pgob(pmu, enable);
}