From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 Nov 2011 00:34:43 +0000 (+1100)
Subject: Merge remote-tracking branch 'slave-dma/next'
X-Git-Tag: next-20111114~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=32993e1d180f0ace512ddbfcf7402aab39d0915d;p=karo-tx-linux.git

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

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

32993e1d180f0ace512ddbfcf7402aab39d0915d
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++) {