diff options
| -rw-r--r-- | kernel/irq/devres.c | 2 | ||||
| -rw-r--r-- | lib/devres.c | 2 | ||||
| -rw-r--r-- | mm/dmapool.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c index 1ef4ffcdfa55..bd8e788d71e0 100644 --- 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) | |||
| 87 | { | 87 | { |
| 88 | struct irq_devres match_data = { irq, dev_id }; | 88 | struct irq_devres match_data = { irq, dev_id }; |
| 89 | 89 | ||
| 90 | free_irq(irq, dev_id); | ||
| 91 | WARN_ON(devres_destroy(dev, devm_irq_release, devm_irq_match, | 90 | WARN_ON(devres_destroy(dev, devm_irq_release, devm_irq_match, |
| 92 | &match_data)); | 91 | &match_data)); |
| 92 | free_irq(irq, dev_id); | ||
| 93 | } | 93 | } |
| 94 | EXPORT_SYMBOL(devm_free_irq); | 94 | EXPORT_SYMBOL(devm_free_irq); |
diff --git a/lib/devres.c b/lib/devres.c index 6efddf53b90c..7c0e953a7486 100644 --- a/lib/devres.c +++ b/lib/devres.c | |||
| @@ -79,9 +79,9 @@ EXPORT_SYMBOL(devm_ioremap_nocache); | |||
| 79 | */ | 79 | */ |
| 80 | void devm_iounmap(struct device *dev, void __iomem *addr) | 80 | void devm_iounmap(struct device *dev, void __iomem *addr) |
| 81 | { | 81 | { |
| 82 | iounmap(addr); | ||
| 83 | WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match, | 82 | WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match, |
| 84 | (void *)addr)); | 83 | (void *)addr)); |
| 84 | iounmap(addr); | ||
| 85 | } | 85 | } |
| 86 | EXPORT_SYMBOL(devm_iounmap); | 86 | EXPORT_SYMBOL(devm_iounmap); |
| 87 | 87 | ||
diff --git a/mm/dmapool.c b/mm/dmapool.c index 03bf3bb4519a..fbb58e346888 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c | |||
| @@ -500,7 +500,7 @@ void dmam_pool_destroy(struct dma_pool *pool) | |||
| 500 | { | 500 | { |
| 501 | struct device *dev = pool->dev; | 501 | struct device *dev = pool->dev; |
| 502 | 502 | ||
| 503 | dma_pool_destroy(pool); | ||
| 504 | WARN_ON(devres_destroy(dev, dmam_pool_release, dmam_pool_match, pool)); | 503 | WARN_ON(devres_destroy(dev, dmam_pool_release, dmam_pool_match, pool)); |
| 504 | dma_pool_destroy(pool); | ||
| 505 | } | 505 | } |
| 506 | EXPORT_SYMBOL(dmam_pool_destroy); | 506 | EXPORT_SYMBOL(dmam_pool_destroy); |
