From: akpm@linux-foundation.org Subject: [patch 2/6] drivers/gpu/drm/nouveau/nouveau_grctx.c: correct NULL test Date: Tue, 02 Feb 2010 14:40:30 -0800 Message-ID: <201002022240.o12MeUlU018886@imap1.linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.sourceforge.net To: airlied@linux.ie Cc: akpm@linux-foundation.org, dri-devel@lists.sourceforge.net, julia@diku.dk, bskeggs@redhat.com List-Id: dri-devel@lists.freedesktop.org From: Julia Lawall 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/) // @@ expression x,y; statement S; @@ x = \(kmalloc\|kcalloc\|kzalloc\)(...); ( if ((x) == NULL) S | if ( - y + x == NULL) S ) // Signed-off-by: Julia Lawall Cc: David Airlie Cc: Ben Skeggs Signed-off-by: Andrew Morton --- drivers/gpu/drm/nouveau/nouveau_grctx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/gpu/drm/nouveau/nouveau_grctx.c~drivers-gpu-drm-nouveau-nouveau_grctxc-correct-null-test drivers/gpu/drm/nouveau/nouveau_grctx.c --- a/drivers/gpu/drm/nouveau/nouveau_grctx.c~drivers-gpu-drm-nouveau-nouveau_grctxc-correct-null-test +++ a/drivers/gpu/drm/nouveau/nouveau_grctx.c @@ -97,8 +97,8 @@ nouveau_grctx_prog_load(struct drm_devic } 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; _ ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com --