From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 16 Jun 2014 23:39:18 +0000 (+1000)
Subject: drm/nv50/disp: fix a potential oops in supervisor handling
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~8552^2~5^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ba5e01b0d0146c2d2bb5475cf1d6efec51bf2669;p=mirror_ubuntu-zesty-kernel.git

drm/nv50/disp: fix a potential oops in supervisor handling

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
index 1e85f36c705f..26e962b7e702 100644
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
@@ -1270,7 +1270,7 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk, u32 *conf)
 	i--;
 
 	outp = exec_lookup(priv, head, i, ctrl, &data, &ver, &hdr, &cnt, &len, &info1);
-	if (!data)
+	if (!outp)
 		return NULL;
 
 	if (outp->info.location == 0) {