Messages in this thread | | | Date | Fri, 11 Nov 2011 14:06:38 +0530 | Subject | Re: linux-next: manual merge of the slave-dma tree with the s5p tree | From | Thomas Abraham <> |
| |
Hi Stephen,
On 11 November 2011 06:30, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi Vinod, > > Today's linux-next merge of the slave-dma tree got a conflict in > drivers/dma/pl330.c between commit c6e00b47067b ("DMA: PL330: Add device > tree support") from the s5p tree and commit dab6538e29e6 ("DMA: PL330: > Fix build warning") from the slave-dma tree. > > I fixed it up (see below) and can carry the fix as necessary. > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc drivers/dma/pl330.c > index a626e15,186b822..0000000 > --- 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++) { >
Thanks for the fix. Also taking into account the suggestion from Joe Perches, this change could be
> - 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_t(int, pdat ? pdat->nr_valid_peri : pi->pcfg.num_peri, > ++ pi->pcfg.num_chan); > pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL); >
Regards, Thomas. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |