diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-16 11:05:48 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-16 11:05:48 -0400 |
| commit | 7f47db4006f547b1cf5800c3f548ebe269a06310 (patch) | |
| tree | b60403265a50d80e47a40b1e550e206c690b327b /drivers/base | |
| parent | 5b3b44847590b3cbaafdf01d4ad260fa53d04167 (diff) | |
| parent | eed456f93d01e9476a1e777d22ae8a8382546ab7 (diff) | |
Merge remote-tracking branch 'regmap/topic/irq' into regmap-next
Diffstat (limited to 'drivers/base')
| -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 020ea2b9fd2f..1643e889bafc 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c | |||
| @@ -460,7 +460,8 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, | |||
| 460 | ret = request_threaded_irq(irq, NULL, regmap_irq_thread, irq_flags, | 460 | ret = request_threaded_irq(irq, NULL, regmap_irq_thread, irq_flags, |
| 461 | chip->name, d); | 461 | chip->name, d); |
| 462 | if (ret != 0) { | 462 | if (ret != 0) { |
| 463 | dev_err(map->dev, "Failed to request IRQ %d: %d\n", irq, ret); | 463 | dev_err(map->dev, "Failed to request IRQ %d for %s: %d\n", |
| 464 | irq, chip->name, ret); | ||
| 464 | goto err_domain; | 465 | goto err_domain; |
| 465 | } | 466 | } |
| 466 | 467 | ||