diff options
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 9c4d30483264..6b669593e7eb 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1341,12 +1341,12 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)  	} else if (new->flags & IRQF_TRIGGER_MASK) {  		unsigned int nmsk = new->flags & IRQF_TRIGGER_MASK; -		unsigned int omsk = irq_settings_get_trigger_mask(desc); +		unsigned int omsk = irqd_get_trigger_type(&desc->irq_data);  		if (nmsk != omsk)  			/* hope the handler works with current  trigger mode */  			pr_warn("irq %d uses trigger mode %u; requested %u\n", -				irq, nmsk, omsk); +				irq, omsk, nmsk);  	}  	*old_ptr = new;  |