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

Commit 7d720ee5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regmap/fix/irq', 'regmap/fix/rbtree' and... 

Merge remote-tracking branches 'regmap/fix/irq', 'regmap/fix/rbtree' and 'regmap/fix/sync' into regmap-linus
parents 13a7a6ac 09cadf6e 328f494d 4ceba98d

drivers/base/regmap/regcache-rbtree.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int regcache_rbtree_insert_to_block(struct regmap *map, 
	if (pos == 0) {

		memmove(blk + offset * map->cache_word_size,

			blk, rbnode->blklen * map->cache_word_size);

		bitmap_shift_right(present, present, offset, blklen);

		bitmap_shift_left(present, present, offset, blklen);

	}



	/* update the rbnode block, its size and the base register */

drivers/base/regmap/regcache.c

+4 −2
Original line number Diff line number Diff line
@@ -608,7 +608,8 @@ static int regcache_sync_block_single(struct regmap *map, void *block, 
	for (i = start; i < end; i++) {

		regtmp = block_base + (i * map->reg_stride);



		if (!regcache_reg_present(cache_present, i))

		if (!regcache_reg_present(cache_present, i) ||

		    !regmap_writeable(map, regtmp))

			continue;



		val = regcache_get_val(map, block, i);
@@ -677,7 +678,8 @@ static int regcache_sync_block_raw(struct regmap *map, void *block, 
	for (i = start; i < end; i++) {

		regtmp = block_base + (i * map->reg_stride);



		if (!regcache_reg_present(cache_present, i)) {

		if (!regcache_reg_present(cache_present, i) ||

		    !regmap_writeable(map, regtmp)) {

			ret = regcache_sync_block_raw_flush(map, &data,

							    base, regtmp);

			if (ret != 0)

drivers/base/regmap/regmap-irq.c

+2 −1
Original line number Diff line number Diff line
@@ -499,7 +499,8 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, 
		goto err_alloc;

	}



	ret = request_threaded_irq(irq, NULL, regmap_irq_thread, irq_flags,

	ret = request_threaded_irq(irq, NULL, regmap_irq_thread,

				   irq_flags | IRQF_ONESHOT,

				   chip->name, d);

	if (ret != 0) {

		dev_err(map->dev, "Failed to request IRQ %d for %s: %d\n",