Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

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

diff --git a/lib/devres.c b/lib/devres.c
index 4936860..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);
 
@@ -328,7 +328,7 @@ EXPORT_SYMBOL(pcim_iomap_regions_request_all);
  * @pdev: PCI device to map IO resources for
  * @mask: Mask of BARs to unmap and release
  *
- * Unamp and release regions specified by @mask.
+ * Unmap and release regions specified by @mask.
  */
 void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask)
 {