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

Conflicts:
	drivers/dma/pl330.c

diff --cc drivers/dma/pl330.c
index a626e15799a5b4a3cd3fd8fe323286c6e23e3b91,186b8221803ec7bad7a16f28d9f1c05de9441440..83802b8fccaf2edac866e595bec7acb99ac9eee0
--- 1/drivers/dma/pl330.c
--- 2/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++) {