From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Nov 2011 23:49:15 +0000 (+1100)
Subject: Merge remote-tracking branch 'slave-dma/next'
X-Git-Tag: next-20111116~39
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b50a51c51e9101299dacb90bfb1139f8a37b9c1d;p=karo-tx-linux.git

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

Conflicts:
	drivers/dma/pl330.c
---

b50a51c51e9101299dacb90bfb1139f8a37b9c1d
diff --cc drivers/dma/pl330.c
index a626e15799a5,186b8221803e..83802b8fccaf
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@@ -870,8 -856,8 +870,8 @@@ pl330_probe(struct amba_device *adev, c
  	INIT_LIST_HEAD(&pd->channels);
  
  	/* Initialize channel parameters */
- 	num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,
- 			(u8)pi->pcfg.num_chan);
 -	num_chan = max(pdat ? (int)pdat->nr_valid_peri : 0,
 -					(int)pi->pcfg.num_chan);
++	num_chan = max(pdat ? (int)pdat->nr_valid_peri : (int)pi->pcfg.num_peri,
++			(int)pi->pcfg.num_chan);
  	pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
  
  	for (i = 0; i < num_chan; i++) {