---

yaml --- r: 210517 b: refs/heads/master c: 4ee6985 h: refs/heads/master i: 210515: 41a5434 v: v3
git-mirror · Aug 23, 2010 · 23c6317 · 23c6317
1 parent 5ec4ece
commit 23c6317
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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,