From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 10 Mar 2006 22:24:55 +0000 (+0100)
Subject: [SCSI] megaraid/megaraid_mm.c: fix a NULL pointer dereference
X-Git-Tag: v2.6.17-rc4~4^2~24
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5236467ae72ecd71baa162b7734c57bfe8fa0ff9;p=linux-2.6

[SCSI] megaraid/megaraid_mm.c: fix a NULL pointer dereference

This patch fixes a NULL pointer dereference spotted by the Coverity
checker.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 8f3ce04322..e8f534fb33 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -898,10 +898,8 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp)
 
 	adapter = kmalloc(sizeof(mraid_mmadp_t), GFP_KERNEL);
 
-	if (!adapter) {
-		rval = -ENOMEM;
-		goto memalloc_error;
-	}
+	if (!adapter)
+		return -ENOMEM;
 
 	memset(adapter, 0, sizeof(mraid_mmadp_t));