summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/irqchip/irq-atmel-aic5.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/irqchip/irq-atmel-aic5.c')
-rw-r--r--kernel/drivers/irqchip/irq-atmel-aic5.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/drivers/irqchip/irq-atmel-aic5.c b/kernel/drivers/irqchip/irq-atmel-aic5.c
index 62bb840c6..7dee71bde 100644
--- a/kernel/drivers/irqchip/irq-atmel-aic5.c
+++ b/kernel/drivers/irqchip/irq-atmel-aic5.c
@@ -258,6 +258,7 @@ static int aic5_irq_domain_xlate(struct irq_domain *d,
unsigned int *out_type)
{
struct irq_chip_generic *bgc = irq_get_domain_generic_chip(d, 0);
+ unsigned long flags;
unsigned smr;
int ret;
@@ -269,13 +270,13 @@ static int aic5_irq_domain_xlate(struct irq_domain *d,
if (ret)
return ret;
- irq_gc_lock(bgc);
+ irq_gc_lock_irqsave(bgc, flags);
irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR);
smr = irq_reg_readl(bgc, AT91_AIC5_SMR);
ret = aic_common_set_priority(intspec[2], &smr);
if (!ret)
irq_reg_writel(bgc, intspec[2] | smr, AT91_AIC5_SMR);
- irq_gc_unlock(bgc);
+ irq_gc_unlock_irqrestore(bgc, flags);
return ret;
}