fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / mtd / maps / lasat.c

diff --git a/drivers/mtd/maps/lasat.c b/drivers/mtd/maps/lasat.c
index 2a2efaa..e343763 100644 (file)
--- a/drivers/mtd/maps/lasat.c
+++ b/drivers/mtd/maps/lasat.c
@@ -7,7 +7,7 @@
  * modify it under the terms of the GNU General Public License version
  * 2 as published by the Free Software Foundation.
  *
- * $Id: lasat.c,v 1.7 2004/07/12 21:59:44 dwmw2 Exp $
+ * $Id: lasat.c,v 1.9 2004/11/04 13:24:15 gleixner Exp $
  *
  */
 
@@ -19,7 +19,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
-#include <linux/config.h>
 #include <asm/lasat/lasat.h>
 
 static struct mtd_info *lasat_mtd;
@@ -50,7 +49,7 @@ static int __init init_lasat(void)
        ENABLE_VPP((&lasat_map));
 
        lasat_map.phys = lasat_flash_partition_start(LASAT_MTD_BOOTLOADER);
-       lasat_map.virt = (unsigned long)ioremap_nocache(
+       lasat_map.virt = ioremap_nocache(
                        lasat_map.phys, lasat_board_info.li_flash_size);
        lasat_map.size = lasat_board_info.li_flash_size;
 
@@ -80,6 +79,7 @@ static int __init init_lasat(void)
                return 0;
        }
 
+       iounmap(lasat_map.virt);
        return -ENXIO;
 }
 
@@ -90,6 +90,7 @@ static void __exit cleanup_lasat(void)
                map_destroy(lasat_mtd);
        }
        if (lasat_map.virt) {
+               iounmap(lasat_map.virt);
                lasat_map.virt = 0;
        }
 }