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

diff --cc drivers/dma/pl330.c
index f5843bc80baa9b8168f6034ad167ce46a0d537bb,28322dced886b9655ef67c78a83f0e2ee65b0942..2ebd4cd45a204ce475b39a0dcaa3bc6a2cc02d0f
--- 1/drivers/dma/pl330.c
--- 2/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);
-               goto probe_err5;
 +      if (!pdmac->peripherals) {
 +              ret = -ENOMEM;
 +              dev_err(&adev->dev, "unable to allocate pdmac->peripherals\n");
++              goto probe_err4;
 +      }
  
        for (i = 0; i < num_chan; i++) {
                pch = &pdmac->peripherals[i];