---

yaml --- r: 323013 b: refs/heads/master c: 61c6e75 h: refs/heads/master i: 323011: f87b950 v: v3
git-mirror · Sep 18, 2012 · 1da8f12 · 1da8f12
1 parent 931383e
commit 1da8f12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e2c682becb20416c140aa0d6d3137b51a5c76da
+refs/heads/master: 61c6e7531d3b66b33187b8cdd700fd8ab93ffd62
diff --git a/trunk/drivers/dma/pl330.c b/trunk/drivers/dma/pl330.c
@@ -2930,6 +2930,11 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
 		num_chan = max_t(int, pi->pcfg.num_peri, pi->pcfg.num_chan);
 
 	pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
+	if (!pdmac->peripherals) {
+		ret = -ENOMEM;
+		dev_err(&adev->dev, "unable to allocate pdmac->peripherals\n");
+		goto probe_err5;
+	}
 
 	for (i = 0; i < num_chan; i++) {
 		pch = &pdmac->peripherals[i];