On Thu, Apr 18, 2013 at 12:11 PM, Lee Jones <[email protected]> wrote:
> Before allocating memory for logical channels, the current driver > checks to see if there are any. Well as the dma40_memcpy_channels[] > array is always populated, the check is always true. Best to > remove the check. > > Cc: Vinod Koul <[email protected]> > Cc: Dan Williams <[email protected]> > Cc: Per Forlin <[email protected]> > Cc: Rabin Vincent <[email protected]> > Signed-off-by: Lee Jones <[email protected]> (...) > - if (num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)) { So I guess this was changed when moving the memcpy channels into the driver. > - /* > - * The max number of logical channels are event lines for all > - * src devices and dst devices > - */ > - base->lookup_log_chans = kzalloc(num_log_chans * > - sizeof(struct d40_chan *), > - GFP_KERNEL); And at that point you forgot to rewrite this as kzalloc((num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)), ...)? > - if (!base->lookup_log_chans) > - goto failure; > - } > + base->lookup_log_chans = kzalloc(num_log_chans * > + sizeof(struct d40_chan *), > + GFP_KERNEL); > + if (!base->lookup_log_chans) > + goto failure; So this change should also include the memcpy channels. I'll go back and comment again on the patch moving the memcpy channels into the driver. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

