upgrade to linux 2.6.10-1.12_FC2

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

diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index baff49b..32ea860 100644 (file)
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -5,7 +5,7 @@
  *
  *     (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
  *
- *     $Id: uclinux.c,v 1.7 2004/07/12 21:59:45 dwmw2 Exp $
+ *     $Id: uclinux.c,v 1.9 2004/11/04 13:24:15 gleixner Exp $
  */
 
 /****************************************************************************/
@@ -71,7 +71,7 @@ int __init uclinux_mtd_init(void)
 
        mapp->virt = ioremap_nocache(mapp->phys, mapp->size);
 
-       if (!mapp->virt) {
+       if (mapp->virt == 0) {
                printk("uclinux[mtd]: ioremap_nocache() failed\n");
                return(-EIO);
        }
@@ -81,7 +81,7 @@ int __init uclinux_mtd_init(void)
        mtd = do_map_probe("map_ram", mapp);
        if (!mtd) {
                printk("uclinux[mtd]: failed to find a mapping?\n");
-               iounmap(mapp->virt);
+               iounmap((void *) mapp->virt);
                return(-ENXIO);
        }