From: Mark Brown <broonie@kernel.org>
Date: Tue, 5 Jan 2016 19:07:17 +0000 (+0000)
Subject: Merge remote-tracking branches 'regmap/topic/64bit' and 'regmap/topic/irq-type' into... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a8d99344c9ebc2f12232473f92beac2f894b6ea5;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge remote-tracking branches 'regmap/topic/64bit' and 'regmap/topic/irq-type' into regmap-next
---

a8d99344c9ebc2f12232473f92beac2f894b6ea5
diff --cc drivers/base/regmap/regmap-irq.c
index 4d2cb21254aa,8d16db533527,dbe7a0d15a26..9b0d202414d0
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@@@ -420,11 -420,10 -484,15 +484,16 @@@@ int regmap_add_irq_chip(struct regmap *
   	else
   		d->irq_reg_stride = 1;
   
++ 	if (chip->type_reg_stride)
++ 		d->type_reg_stride = chip->type_reg_stride;
++ 	else
++ 		d->type_reg_stride = 1;
++ 
   	if (!map->use_single_read && map->reg_stride == 1 &&
   	    d->irq_reg_stride == 1) {
 --		d->status_reg_buf = kmalloc(map->format.val_bytes *
 --					    chip->num_regs, GFP_KERNEL);
 ++		d->status_reg_buf = kmalloc_array(chip->num_regs,
 ++						  map->format.val_bytes,
 ++						  GFP_KERNEL);
   		if (!d->status_reg_buf)
   			goto err_alloc;
   	}