| commit | 051047d2fd7c6cb06e55126597e8fdf9b481c4c1 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Wed Sep 05 11:40:13 2012 -0700 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Wed Sep 05 11:40:13 2012 -0700 |
| tree | 8eaa2c2055babc4cd927877de4b6596872d0db24 | |
| parent | d903836e4155a61f4794606ceb80b9e1381b1cbc [diff] | |
| parent | bf18f9af6a47a9b140bb4a90f19f8a196f4546b5 [diff] |
Merge "ARM: GIC: fix irq_trigger return" into msm-3.4
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index bbd6c63..9dd4347 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c
@@ -367,7 +367,8 @@ if (gic_arch_extn.irq_retrigger) return gic_arch_extn.irq_retrigger(d); - return -ENXIO; + /* the genirq layer expects 0 for a failure */ + return 0; } #ifdef CONFIG_SMP