From: Mark Brown <broonie@linaro.org>
Date: Tue, 26 Nov 2013 13:16:56 +0000 (+0000)
Subject: Merge remote-tracking branches 'regmap/fix/doc' and 'regmap/fix/mmio' into regmap... 
X-Git-Tag: v3.13-rc4~14^2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=652787ab1aca35e5e85e644757f7ea2cc00681d1;hp=-c;p=~andy%2Flinux

Merge remote-tracking branches 'regmap/fix/doc' and 'regmap/fix/mmio' into regmap-linus
---

652787ab1aca35e5e85e644757f7ea2cc00681d1
diff --combined drivers/base/regmap/regmap.c
index d1a914116f6,f441084bbc8,9c021d9cace..c2e00210094
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@@ -1549,7 -1549,7 -1549,7 +1549,7 @@@@ int regmap_bulk_write(struct regmap *ma
   						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 -1743,7 +1743,7 @@@@ static int _regmap_read(struct regmap *
   /**
    * 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 -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 -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