linux-next: manual merge of the sound-asoc tree with the regmap tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
drivers/base/regmap/regmap.c between commit 6560ffd1ccd6 ("regmap: fix
possible memory corruption in regmap_bulk_read()") from the regmap tree
and commit edc9ae420f98 ("regmap: implement register striding") from the
sound-asoc tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/base/regmap/regmap.c
index bb80853,8a25006..0000000
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -775,11 -863,10 +863,12 @@@ int regmap_bulk_read(struct regmap *map
  			map->format.parse_val(val + i);
  	} else {
  		for (i = 0; i < val_count; i++) {
 +			unsigned int ival;
- 			ret = regmap_read(map, reg + i, &ival);
+ 			ret = regmap_read(map, reg + (i * map->reg_stride),
 -					  val + (i * val_bytes));
++					  &ival);
  			if (ret != 0)
  				return ret;
 +			memcpy(val + (i * val_bytes), &ival, val_bytes);
  		}
  	}

Attachment: pgpLIAYuCXpNE.pgp
Description: PGP signature