diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-06-16 19:39:18 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-06-17 00:41:41 -0400 |
| commit | ba5e01b0d0146c2d2bb5475cf1d6efec51bf2669 (patch) | |
| tree | 359ab6a6ae6519425d17b1438a3078f864df9f7d | |
| parent | cf7c5d67e192e0bdc9e4372392006c224618ca0c (diff) | |
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 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) | |||
| 1270 | i--; | 1270 | i--; |
| 1271 | 1271 | ||
| 1272 | outp = exec_lookup(priv, head, i, ctrl, &data, &ver, &hdr, &cnt, &len, &info1); | 1272 | outp = exec_lookup(priv, head, i, ctrl, &data, &ver, &hdr, &cnt, &len, &info1); |
| 1273 | if (!data) | 1273 | if (!outp) |
| 1274 | return NULL; | 1274 | return NULL; |
| 1275 | 1275 | ||
| 1276 | if (outp->info.location == 0) { | 1276 | if (outp->info.location == 0) { |