From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Sep 2012 01:37:45 +0000 (+1000)
Subject: Merge remote-tracking branch 'slave-dma/next'
X-Git-Tag: next-20120926~69
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d26e2986c9bba1747e2422a7497b86a0127906f2;p=karo-tx-linux.git

Merge remote-tracking branch 'slave-dma/next'
---

d26e2986c9bba1747e2422a7497b86a0127906f2
diff --cc drivers/dma/pl330.c
index f5843bc80baa,28322dced886..2ebd4cd45a20
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@@ -2930,11 -2913,6 +2915,11 @@@ pl330_probe(struct amba_device *adev, c
  		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;
++		goto probe_err4;
 +	}
  
  	for (i = 0; i < num_chan; i++) {
  		pch = &pdmac->peripherals[i];