Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm'

[firefly-linux-kernel-4.4.55.git] / kernel / irq / manage.c

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 0a9104b4608b8dc374769a7435b594f27a0b97ae..80692373abd6e809b973c4be5fcad24ef52edfd7 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -183,6 +183,7 @@ int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask,
        ret = chip->irq_set_affinity(data, mask, force);
        switch (ret) {
        case IRQ_SET_MASK_OK:
+       case IRQ_SET_MASK_OK_DONE:
                cpumask_copy(data->affinity, mask);
        case IRQ_SET_MASK_OK_NOCOPY:
                irq_set_thread_affinity(desc);
@@ -600,6 +601,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
 
        switch (ret) {
        case IRQ_SET_MASK_OK:
+       case IRQ_SET_MASK_OK_DONE:
                irqd_clear(&desc->irq_data, IRQD_TRIGGER_MASK);
                irqd_set(&desc->irq_data, flags);