From 23c6317ac67580a6db10d14b0551a60bd9842282 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Mon, 23 Aug 2010 12:28:15 +0200
Subject: [PATCH] --- yaml --- r: 210517 b: refs/heads/master c:
 4ee69851cd4880f574d22f5ce08bec35b01c94e3 h: refs/heads/master i:   210515:
 41a5434402dafbec7da2a6aaab358d361debe679 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/block/cciss.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2a8ce5abad6e..caff12dbe052 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d6ac1c1a3d4f95953aa3b085e8f16692d3a7179
+refs/heads/master: 4ee69851cd4880f574d22f5ce08bec35b01c94e3
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index ce1a75df5902..7191c16954d2 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -4718,6 +4718,9 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
 	h->scatter_list = kmalloc(h->max_commands *
 						sizeof(struct scatterlist *),
 						GFP_KERNEL);
+	if (!h->scatter_list)
+		goto clean4;
+
 	for (k = 0; k < h->nr_cmds; k++) {
 		h->scatter_list[k] = kmalloc(sizeof(struct scatterlist) *
 							h->maxsgentries,