Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Linus Torvalds [Mon, 7 Nov 2005 18:24:08 +0000 (10:24 -0800)]
Some manual fixups for clashing kfree() cleanups etc.

22 files changed:
1  2 
drivers/mtd/chips/cfi_cmdset_0001.c
drivers/mtd/chips/cfi_cmdset_0002.c
drivers/mtd/devices/blkmtd.c
drivers/mtd/inftlcore.c
drivers/mtd/inftlmount.c
drivers/mtd/maps/amd76xrom.c
drivers/mtd/maps/bast-flash.c
drivers/mtd/maps/ichxrom.c
drivers/mtd/maps/integrator-flash.c
drivers/mtd/maps/ipaq-flash.c
drivers/mtd/maps/iq80310.c
drivers/mtd/maps/ixp2000.c
drivers/mtd/maps/ixp4xx.c
drivers/mtd/maps/lubbock-flash.c
drivers/mtd/maps/omap-toto-flash.c
drivers/mtd/maps/sa1100-flash.c
drivers/mtd/maps/sun_uflash.c
drivers/mtd/maps/tqm8xxl.c
drivers/mtd/nand/nand_base.c
drivers/mtd/nftlcore.c
fs/Kconfig
fs/jffs2/wbuf.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -121,10 -114,11 +114,10 @@@ static int ixp4xx_flash_remove(struct d
                del_mtd_partitions(info->mtd);
                map_destroy(info->mtd);
        }
-       if (info->map.map_priv_1)
-               iounmap((void *) info->map.map_priv_1);
+       if (info->map.virt)
+               iounmap(info->map.virt);
  
 -      if (info->partitions)
 -              kfree(info->partitions);
 +      kfree(info->partitions);
  
        if (info->res) {
                release_resource(info->res);
Simple merge
Simple merge
Simple merge
@@@ -166,9 -166,11 +166,9 @@@ static void __exit uflash_cleanup(void
                        iounmap(udev->map.virt);
                        udev->map.virt = NULL;
                }
 -              if(0 != udev->name) {
 -                      kfree(udev->name);
 -              }
 +              kfree(udev->name);
                kfree(udev);
-       }       
+       }
  }
  
  module_init(uflash_init);
Simple merge
Simple merge
Simple merge
diff --cc fs/Kconfig
Simple merge
diff --cc fs/jffs2/wbuf.c
Simple merge