Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / drivers / mtd / maps / cstm_mips_ixx.c

diff --git a/drivers/mtd/maps/cstm_mips_ixx.c b/drivers/mtd/maps/cstm_mips_ixx.c
index d6bef100d69a2b2f3be47aa71f537bd4c8ed44ee..df2c38ef105ad476769c0d30004f6a3ea61e9549 100644 (file)
--- a/drivers/mtd/maps/cstm_mips_ixx.c
+++ b/drivers/mtd/maps/cstm_mips_ixx.c
@@ -175,8 +175,8 @@ int __init init_cstm_mips_ixx(void)
                        printk(KERN_WARNING "Failed to ioremap\n");
                        for (j = 0; j < i; j++) {
                                if (cstm_mips_ixx_map[j].virt) {
-                                       iounmap((void *)cstm_mips_ixx_map[j].virt);
-                                       cstm_mips_ixx_map[j].virt = 0;
+                                       iounmap(cstm_mips_ixx_map[j].virt);
+                                       cstm_mips_ixx_map[j].virt = NULL;
                                }
                        }
                        return -EIO;
@@ -214,8 +214,8 @@ int __init init_cstm_mips_ixx(void)
                else {
                        for (i = 0; i < PHYSMAP_NUMBER; i++) {
                                if (cstm_mips_ixx_map[i].virt) {
-                                       iounmap((void *)cstm_mips_ixx_map[i].virt);
-                                       cstm_mips_ixx_map[i].virt = 0;
+                                       iounmap(cstm_mips_ixx_map[i].virt);
+                                       cstm_mips_ixx_map[i].virt = NULL;
                                }
                        }
                        return -ENXIO;