diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-19 13:45:32 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-19 13:45:32 +1100 |
commit | 32ad370c2a833f2be7bd38230286273487890fa2 (patch) | |
tree | 879d7ef80812eb4c18562ba7f945f9871342bba8 | |
parent | 6c443ec6bdcf5296a08a0eaae1b18488d822def3 (diff) | |
parent | 48bbdbb173faf2c1659d21a3720768848651e414 (diff) |
Merge remote-tracking branch 'regmap/for-next'
-rw-r--r-- | drivers/base/regmap/regmap-irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index 6299a50a596..a6c3f75b4b0 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c @@ -499,7 +499,8 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, goto err_alloc; } - ret = request_threaded_irq(irq, NULL, regmap_irq_thread, irq_flags, + ret = request_threaded_irq(irq, NULL, regmap_irq_thread, + irq_flags | IRQF_ONESHOT, chip->name, d); if (ret != 0) { dev_err(map->dev, "Failed to request IRQ %d for %s: %d\n", |