Merge tag 'squashfs-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl...

[~andy/linux] / kernel / irq / devres.c

diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c
index 1ef4ffcdfa55b40ef17b0ff4aef0c6533b226308..bd8e788d71e0dd582caa3f97602fd3b86acc21fb 100644 (file)
--- a/kernel/irq/devres.c
+++ b/kernel/irq/devres.c
@@ -87,8 +87,8 @@ void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id)
 {
        struct irq_devres match_data = { irq, dev_id };
 
-       free_irq(irq, dev_id);
        WARN_ON(devres_destroy(dev, devm_irq_release, devm_irq_match,
                               &match_data));
+       free_irq(irq, dev_id);
 }
 EXPORT_SYMBOL(devm_free_irq);