From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 7 Nov 2005 18:24:08 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
X-Git-Tag: v2.6.15-rc1~448
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3ce1debe2685383a9ad6ace9c49869c3968c013;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

Some manual fixups for clashing kfree() cleanups etc.
---

b3ce1debe2685383a9ad6ace9c49869c3968c013
diff --cc drivers/mtd/maps/ixp4xx.c
index 0d87c02dee,471553a3da..56b3a355bf
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@@ -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);
diff --cc drivers/mtd/maps/sun_uflash.c
index 1355c28f90,47941fbe74..0758cb1d01
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@@ -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);