diff options
author | Julia Lawall <julia@diku.dk> | 2010-02-02 14:40:30 -0800 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-02-09 12:49:55 +1000 |
commit | 7dad9ef6d9255b4d2d0a26305a785a55f3ba55e3 (patch) | |
tree | 33f83c024e834dc26f47db4cbea0224342244f26 /drivers/gpu/drm/nouveau/nouveau_grctx.c | |
parent | f0fbe3eb5f65fe5948219f4ceac68f8a665b1fc6 (diff) | |
download | blackbird-op-linux-7dad9ef6d9255b4d2d0a26305a785a55f3ba55e3.tar.gz blackbird-op-linux-7dad9ef6d9255b4d2d0a26305a785a55f3ba55e3.zip |
drivers/gpu/drm/nouveau/nouveau_grctx.c: correct NULL test
Test the just-allocated value for NULL rather than some other value.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x,y;
statement S;
@@
x = \(kmalloc\|kcalloc\|kzalloc\)(...);
(
if ((x) == NULL) S
|
if (
- y
+ x
== NULL)
S
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: David Airlie <airlied@linux.ie>
Cc: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_grctx.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_grctx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_grctx.c b/drivers/gpu/drm/nouveau/nouveau_grctx.c index 419f4c2b3b89..c7ebec696747 100644 --- a/drivers/gpu/drm/nouveau/nouveau_grctx.c +++ b/drivers/gpu/drm/nouveau/nouveau_grctx.c @@ -97,8 +97,8 @@ nouveau_grctx_prog_load(struct drm_device *dev) } pgraph->ctxvals = kmalloc(fw->size, GFP_KERNEL); - if (!pgraph->ctxprog) { - NV_ERROR(dev, "OOM copying ctxprog\n"); + if (!pgraph->ctxvals) { + NV_ERROR(dev, "OOM copying ctxvals\n"); release_firmware(fw); nouveau_grctx_fini(dev); return -ENOMEM; |