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
git-mirror · Aug 15, 2011 · 259a534 · 259a534
2 parents 93ee7a9 + b33f9cb
commit 259a534
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
@@ -113,3 +113,4 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c,
 }
 EXPORT_SYMBOL_GPL(regmap_init_i2c);
 
+MODULE_LICENSE("GPL");
diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c
@@ -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");
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
@@ -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;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -113,3 +113,4 @@ struct regmap regmap_init_i2c(struct i2c_client i2c,
		}
		EXPORT_SYMBOL_GPL(regmap_init_i2c);

		MODULE_LICENSE("GPL");