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

Commit 599eefa0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-v3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap fixes from Mark Brown:
 "Two small changes to fix some error handling and checking (both of
  which would be quite serious if the errors trigger) plus a trivial
  documentation fix"

* tag 'regmap-v3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: use IS_ERR() to check clk_get() results
  regmap: make sure we unlock on failure in regmap_bulk_write
  regmap: trivial comment fix (copy'n'paste error)
parents 31f984d1 652787ab

drivers/base/regmap/regmap-mmio.c

+6 −5
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static int regmap_mmio_gather_write(void *context, 


	BUG_ON(reg_size != 4);



	if (ctx->clk) {

	if (!IS_ERR(ctx->clk)) {

		ret = clk_enable(ctx->clk);

		if (ret < 0)

			return ret;
@@ -73,7 +73,7 @@ static int regmap_mmio_gather_write(void *context, 
		offset += ctx->val_bytes;

	}



	if (ctx->clk)

	if (!IS_ERR(ctx->clk))

		clk_disable(ctx->clk);



	return 0;
@@ -96,7 +96,7 @@ static int regmap_mmio_read(void *context, 


	BUG_ON(reg_size != 4);



	if (ctx->clk) {

	if (!IS_ERR(ctx->clk)) {

		ret = clk_enable(ctx->clk);

		if (ret < 0)

			return ret;
@@ -129,7 +129,7 @@ static int regmap_mmio_read(void *context, 
		offset += ctx->val_bytes;

	}



	if (ctx->clk)

	if (!IS_ERR(ctx->clk))

		clk_disable(ctx->clk);



	return 0;
@@ -139,7 +139,7 @@ static void regmap_mmio_free_context(void *context) 
{

	struct regmap_mmio_context *ctx = context;



	if (ctx->clk) {

	if (!IS_ERR(ctx->clk)) {

		clk_unprepare(ctx->clk);

		clk_put(ctx->clk);

	}
@@ -209,6 +209,7 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev, 


	ctx->regs = regs;

	ctx->val_bytes = config->val_bits / 8;

	ctx->clk = ERR_PTR(-ENODEV);



	if (clk_id == NULL)

		return ctx;

drivers/base/regmap/regmap.c

+4 −4
Original line number Diff line number Diff line
@@ -1549,7 +1549,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, 
						val + (i * val_bytes),

						val_bytes);

			if (ret != 0)

				return ret;

				goto out;

		}

	} else {

		ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count);
@@ -1743,7 +1743,7 @@ static int _regmap_read(struct regmap *map, unsigned int reg, 
/**

 * regmap_read(): Read a value from a single register

 *

 * @map: Register map to write to

 * @map: Register map to read from

 * @reg: Register to be read from

 * @val: Pointer to store read value

 *
@@ -1770,7 +1770,7 @@ EXPORT_SYMBOL_GPL(regmap_read); 
/**

 * regmap_raw_read(): Read raw data from the device

 *

 * @map: Register map to write to

 * @map: Register map to read from

 * @reg: First register to be read from

 * @val: Pointer to store read value

 * @val_len: Size of data to read
@@ -1882,7 +1882,7 @@ EXPORT_SYMBOL_GPL(regmap_fields_read); 
/**

 * regmap_bulk_read(): Read multiple registers from the device

 *

 * @map: Register map to write to

 * @map: Register map to read from

 * @reg: First register to be read from

 * @val: Pointer to store read value, in native register size for device

 * @val_count: Number of registers to read