]> Pileus Git - ~andy/linux/commitdiff
Merge remote-tracking branch 'regmap/fix/core' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 31 Mar 2013 22:09:22 +0000 (23:09 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 31 Mar 2013 22:09:22 +0000 (23:09 +0100)
1  2 
drivers/base/regmap/regmap.c

index 89a920510e1dd565499eff6d0da47758a0e6872f,50ef277ea4b631ec7a62e45822e6be946bb5b301..7008f744c00d7f84d3adeec09d46943c6c003a10
@@@ -710,12 -710,12 +710,12 @@@ skip_format_initialization
                }
        }
  
+       regmap_debugfs_init(map, config->name);
        ret = regcache_init(map, config);
        if (ret != 0)
                goto err_range;
  
-       regmap_debugfs_init(map, config->name);
        /* Add a devres resource for dev_get_regmap() */
        m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL);
        if (!m) {
@@@ -943,7 -943,8 +943,7 @@@ static int _regmap_raw_write(struct reg
                unsigned int ival;
                int val_bytes = map->format.val_bytes;
                for (i = 0; i < val_len / val_bytes; i++) {
 -                      memcpy(map->work_buf, val + (i * val_bytes), val_bytes);
 -                      ival = map->format.parse_val(map->work_buf);
 +                      ival = map->format.parse_val(val + (i * val_bytes));
                        ret = regcache_write(map, reg + (i * map->reg_stride),
                                             ival);
                        if (ret) {