diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-06-17 09:39:18 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-06-17 14:41:41 +1000 |
| commit | ba5e01b0d0146c2d2bb5475cf1d6efec51bf2669 (patch) | |
| tree | 359ab6a6ae6519425d17b1438a3078f864df9f7d | |
| parent | cf7c5d67e192e0bdc9e4372392006c224618ca0c (diff) | |
| download | op-kernel-dev-ba5e01b0d0146c2d2bb5475cf1d6efec51bf2669.zip op-kernel-dev-ba5e01b0d0146c2d2bb5475cf1d6efec51bf2669.tar.gz | |
drm/nv50/disp: fix a potential oops in supervisor handling
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c index 1e85f36..26e962b 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) { |
