diff options
Diffstat (limited to 'drivers/dma/pl330.c')
-rw-r--r-- | drivers/dma/pl330.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 571041477ab2..186b8221803e 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c | |||
@@ -856,7 +856,8 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) | |||
856 | INIT_LIST_HEAD(&pd->channels); | 856 | INIT_LIST_HEAD(&pd->channels); |
857 | 857 | ||
858 | /* Initialize channel parameters */ | 858 | /* Initialize channel parameters */ |
859 | num_chan = max(pdat ? pdat->nr_valid_peri : 0, (u8)pi->pcfg.num_chan); | 859 | num_chan = max(pdat ? (int)pdat->nr_valid_peri : 0, |
860 | (int)pi->pcfg.num_chan); | ||
860 | pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL); | 861 | pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL); |
861 | 862 | ||
862 | for (i = 0; i < num_chan; i++) { | 863 | for (i = 0; i < num_chan; i++) { |