Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 259a5340 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Specify a module license
  regmap: Fix bulk reads
parents 93ee7a93 b33f9cbd

drivers/base/regmap/regmap-i2c.c

+1 −0
Original line number Diff line number Diff line
@@ -113,3 +113,4 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c, 
}

EXPORT_SYMBOL_GPL(regmap_init_i2c);



MODULE_LICENSE("GPL");

drivers/base/regmap/regmap-spi.c

+2 −0
Original line number Diff line number Diff line
@@ -70,3 +70,5 @@ struct regmap *regmap_init_spi(struct spi_device *spi, 
	return regmap_init(&spi->dev, &regmap_spi, config);

}

EXPORT_SYMBOL_GPL(regmap_init_spi);



MODULE_LICENSE("GPL");

drivers/base/regmap/regmap.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val, 
		u8[0] |= map->bus->read_flag_mask;



	ret = map->bus->read(map->dev, map->work_buf, map->format.reg_bytes,

			     val, map->format.val_bytes);

			     val, val_len);

	if (ret != 0)

		return ret;