From 66e8488bbbe04c5211d66797d640df3fcfe98a3e Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 1 Aug 2012 11:40:48 -0600 Subject: [PATCH] --- yaml --- r: 323294 b: refs/heads/master c: ca142750f8ac3d01e45909e624ca783779894640 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/regmap/regmap-irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e21c170407fa..99260d18d671 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ac140ec426ed304237205be77f99eedfc1186b5 +refs/heads/master: ca142750f8ac3d01e45909e624ca783779894640 diff --git a/trunk/drivers/base/regmap/regmap-irq.c b/trunk/drivers/base/regmap/regmap-irq.c index 72a6f31e8223..bf1203cbd122 100644 --- a/trunk/drivers/base/regmap/regmap-irq.c +++ b/trunk/drivers/base/regmap/regmap-irq.c @@ -131,7 +131,6 @@ static int regmap_irq_set_wake(struct irq_data *data, unsigned int on) } static const struct irq_chip regmap_irq_chip = { - .name = "regmap", .irq_bus_lock = regmap_irq_lock, .irq_bus_sync_unlock = regmap_irq_sync_unlock, .irq_disable = regmap_irq_disable, @@ -287,6 +286,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, } d->irq_chip = regmap_irq_chip; + d->irq_chip.name = chip->name; d->irq = irq; d->map = map; d->chip = chip;