On Mon, Feb 27, 2017 at 08:08:47PM -0800, Dmitry Torokhov wrote: > Lists of spi_board_info entries registered with spi_register_board_info() > can be quite long; instead of forcing memory allocator find contagious > chunk of memory, let;s allocate them one-by-one, so they can be packed as > needed. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> > --- > drivers/spi/spi.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c > index b948d8cdbace..029864410a5f 100644 > --- a/drivers/spi/spi.c > +++ b/drivers/spi/spi.c > @@ -686,14 +686,13 @@ int spi_register_board_info(struct spi_board_info const *info, unsigned n) > if (!n) > return -EINVAL; > > - bi = kzalloc(n * sizeof(*bi), GFP_KERNEL); > - if (!bi) > - return -ENOMEM; > - > - for (i = 0; i < n; i++, bi++, info++) { > + for (i = 0; i < n; i++, info++) { > struct spi_master *master; > > - memcpy(&bi->board_info, info, sizeof(*info)); > + bi = kmemdup(info, sizeof(*bi), GFP_KERNEL); Meh, should not have changed to kmemdup at the 11th hour: different types. I'll send v2 in a minute. > + if (!bi) > + return -ENOMEM; > + > bi->board_info.properties = > property_entries_dup(info->properties); > if (IS_ERR(bi->board_info.properties)) > -- > 2.11.0.483.g087da7b7c-goog > -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html