From f231981df29bc95659308b7d42786799c7acd994 Mon Sep 17 00:00:00 2001 From: Yunfan Zhang Date: Sat, 8 Sep 2012 03:53:25 -0700 Subject: [PATCH] --- yaml --- r: 323300 b: refs/heads/master c: 81380739516730124067576c9cc9f2418be5bf36 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 ebb3af65f4e8..ac113e9138bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36ac914ba2a5f1a14c5e0bf5d33bc20016d50940 +refs/heads/master: 81380739516730124067576c9cc9f2418be5bf36 diff --git a/trunk/drivers/base/regmap/regmap-irq.c b/trunk/drivers/base/regmap/regmap-irq.c index 094f9988fdf2..5b6b1d8e6cc0 100644 --- a/trunk/drivers/base/regmap/regmap-irq.c +++ b/trunk/drivers/base/regmap/regmap-irq.c @@ -226,7 +226,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, &data->irq_chip, handle_edge_irq); + irq_set_chip(virq, &data->irq_chip); irq_set_nested_thread(virq, 1); /* ARM needs us to explicitly flag the IRQ as valid