From 892193706fb5025c3e39d2dd711c1df2c7966fae Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 1 Aug 2012 11:40:47 -0600 Subject: [PATCH] --- yaml --- r: 323293 b: refs/heads/master c: 7ac140ec426ed304237205be77f99eedfc1186b5 h: refs/heads/master i: 323291: 288de6999380f35b00c0fa1d29d4bbf9a59b175c v: v3 --- [refs] | 2 +- trunk/drivers/base/regmap/regmap-irq.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 076a6267c53f..e21c170407fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0eb46ad0c8d60943c1f46cef795fc537fbffd177 +refs/heads/master: 7ac140ec426ed304237205be77f99eedfc1186b5 diff --git a/trunk/drivers/base/regmap/regmap-irq.c b/trunk/drivers/base/regmap/regmap-irq.c index 4a52743b60cd..72a6f31e8223 100644 --- a/trunk/drivers/base/regmap/regmap-irq.c +++ b/trunk/drivers/base/regmap/regmap-irq.c @@ -22,6 +22,7 @@ struct regmap_irq_chip_data { struct mutex lock; + struct irq_chip irq_chip; struct regmap *map; const struct regmap_irq_chip *chip; @@ -129,7 +130,7 @@ static int regmap_irq_set_wake(struct irq_data *data, unsigned int on) return 0; } -static struct irq_chip regmap_irq_chip = { +static const struct irq_chip regmap_irq_chip = { .name = "regmap", .irq_bus_lock = regmap_irq_lock, .irq_bus_sync_unlock = regmap_irq_sync_unlock, @@ -197,7 +198,7 @@ static int regmap_irq_map(struct irq_domain *h, unsigned int virq, struct regmap_irq_chip_data *data = h->host_data; irq_set_chip_data(virq, data); - irq_set_chip_and_handler(virq, ®map_irq_chip, handle_edge_irq); + irq_set_chip_and_handler(virq, &data->irq_chip, handle_edge_irq); irq_set_nested_thread(virq, 1); /* ARM needs us to explicitly flag the IRQ as valid @@ -285,6 +286,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, goto err_alloc; } + d->irq_chip = regmap_irq_chip; d->irq = irq; d->map = map; d->chip = chip;