From ba846629c7801989bc25481b0e12524b832aec7b Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 21 Mar 2005 08:42:14 +0000
Subject: [PATCH] --- yaml --- r: 4525 b: refs/heads/master c:
 8f5a4486c05275a5f3d53c80c86a44adb7fb8823 h: refs/heads/master i:   4523:
 b3ad772dcc318d20046ee684c11bd9df49ab7320 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/mtd/maps/sharpsl-flash.c | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 65f6937e09e5..04953f49e361 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba38069875a365a33b9b56e42dfdb71b5ce7a3a4
+refs/heads/master: 8f5a4486c05275a5f3d53c80c86a44adb7fb8823
diff --git a/trunk/drivers/mtd/maps/sharpsl-flash.c b/trunk/drivers/mtd/maps/sharpsl-flash.c
index c643d4c5124d..d15da6fd84c1 100644
--- a/trunk/drivers/mtd/maps/sharpsl-flash.c
+++ b/trunk/drivers/mtd/maps/sharpsl-flash.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2001 Lineo Japan, Inc.
  * Copyright (C) 2002  SHARP
  *
- * $Id: sharpsl-flash.c,v 1.3 2005/03/21 00:10:21 rpurdie Exp $
+ * $Id: sharpsl-flash.c,v 1.5 2005/03/21 08:42:11 rpurdie Exp $
  *
  * based on rpxlite.c,v 1.15 2001/10/02 15:05:14 dwmw2 Exp
  *          Handle mapping of the flash on the RPX Lite and CLLF boards
@@ -57,7 +57,8 @@ int __init init_sharpsl(void)
 	int nb_parts = 0;
 	char *part_type = "static";
 
-	printk(KERN_NOTICE "Sharp SL series flash device: %x at %x\n", WINDOW_SIZE, WINDOW_ADDR);
+	printk(KERN_NOTICE "Sharp SL series flash device: %x at %x\n", 
+		WINDOW_SIZE, WINDOW_ADDR);
 	sharpsl_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
 	if (!sharpsl_map.virt) {
 		printk("Failed to ioremap\n");
@@ -74,7 +75,8 @@ int __init init_sharpsl(void)
 
 	mymtd->owner = THIS_MODULE;
 
-	if (machine_is_corgi() || machine_is_shepherd() || machine_is_husky() || machine_is_poodle()) {
+	if (machine_is_corgi() || machine_is_shepherd() || machine_is_husky() 
+		|| machine_is_poodle()) {
 		sharpsl_partitions[0].size=0x006d0000;
 		sharpsl_partitions[0].offset=0x00120000;
 	} else if (machine_is_tosa()) {
@@ -83,8 +85,11 @@ int __init init_sharpsl(void)
 	} else if (machine_is_spitz()) {
 		sharpsl_partitions[0].size=0x006b0000;
 		sharpsl_partitions[0].offset=0x00140000;
-	} else 
-	    return -ENODEV;
+	} else {
+		map_destroy(mymtd);
+		iounmap(sharpsl_map.virt);	
+		return -ENODEV;
+	}
 	
 	parts = sharpsl_partitions;
 	nb_parts = NB_OF(sharpsl_partitions);