summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-13 11:18:34 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-13 19:16:13 +0100
commit2431d0a1d68aabefeee02b93971ee73e8b215697 (patch)
tree06fc50fc05594bd2f40475fe50a100c0677b29a8 /drivers/base
parent8614419451d88bf99fff7f5e468fe45f8450891e (diff)
downloadlinux-2431d0a1d68aabefeee02b93971ee73e8b215697.tar.bz2
regmap: Pass back the allocated regmap IRQ controller data
It's needed for freeing and for obtaining the IRQ base later on. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap-irq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 1befaa7a31cb..f4e6dcfc8504 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -192,6 +192,8 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
if (!d)
return -ENOMEM;
+ *data = d;
+
d->status_buf = kzalloc(sizeof(unsigned int) * chip->num_regs,
GFP_KERNEL);
if (!d->status_buf)