Merge branch 'btrfs-3.0' into for-linus

[pandora-kernel.git] / lib / devres.c

diff --git a/lib/devres.c b/lib/devres.c
index 6efddf5..7c0e953 100644 (file)
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -79,9 +79,9 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
  */
 void devm_iounmap(struct device *dev, void __iomem *addr)
 {
-       iounmap(addr);
        WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
                               (void *)addr));
+       iounmap(addr);
 }
 EXPORT_SYMBOL(devm_iounmap);