summaryrefslogtreecommitdiff
path: root/linux-core/nv50_lut.c
diff options
context:
space:
mode:
authorMaarten Maathuis <madman2003@gmail.com>2008-06-22 18:47:51 +0200
committerMaarten Maathuis <madman2003@gmail.com>2008-06-22 18:47:51 +0200
commite67cd7dda9d7d6d82f4026f246d07bf4c4021a57 (patch)
tree27d0cfeaee52daa79ac6d077420f074a29031d2d /linux-core/nv50_lut.c
parent3809209349ccf12aa71c7848f0b21d77fa0a5f03 (diff)
NV50: A few minor added safeties + cleanup.
Diffstat (limited to 'linux-core/nv50_lut.c')
-rw-r--r--linux-core/nv50_lut.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/linux-core/nv50_lut.c b/linux-core/nv50_lut.c
index 570900ba..cb52f27f 100644
--- a/linux-core/nv50_lut.c
+++ b/linux-core/nv50_lut.c
@@ -37,6 +37,9 @@ static int nv50_lut_alloc(struct nv50_crtc *crtc)
NV50_DEBUG("\n");
+ if (!file_priv)
+ return -ENOMEM;
+
/* Any file_priv should do as it's pointer is used as identification. */
block = nouveau_mem_alloc(crtc->dev, 0, 4096, flags, file_priv);
@@ -137,6 +140,9 @@ int nv50_lut_create(struct nv50_crtc *crtc)
crtc->lut = kzalloc(sizeof(struct nv50_lut), GFP_KERNEL);
+ if (!crtc->lut)
+ return -ENOMEM;
+
rval = nv50_lut_alloc(crtc);
if (rval != 0)
return rval;