OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MTD] sharpsl-flash: Correct error paths 

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Richard Purdie 2005-03-21 08:42:14 +00:00 committed by Thomas Gleixner
parent ba38069875
commit 8f5a4486c0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mtd/maps/sharpsl-flash.c
View File

@ -4,7 +4,7 @@
* Copyright (C) 2001 Lineo Japan, Inc. * Copyright (C) 2001 Lineo Japan, Inc.
* Copyright (C) 2002 SHARP * 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 * 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 * 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; int nb_parts = 0;
char *part_type = "static"; 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); sharpsl_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
if (!sharpsl_map.virt) { if (!sharpsl_map.virt) {
printk("Failed to ioremap\n"); printk("Failed to ioremap\n");
@ -74,7 +75,8 @@ int __init init_sharpsl(void)
mymtd->owner = THIS_MODULE; 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].size=0x006d0000;
sharpsl_partitions[0].offset=0x00120000; sharpsl_partitions[0].offset=0x00120000;
} else if (machine_is_tosa()) { } else if (machine_is_tosa()) {
@ -83,8 +85,11 @@ int __init init_sharpsl(void)
} else if (machine_is_spitz()) { } else if (machine_is_spitz()) {
sharpsl_partitions[0].size=0x006b0000; sharpsl_partitions[0].size=0x006b0000;
sharpsl_partitions[0].offset=0x00140000; sharpsl_partitions[0].offset=0x00140000;
} else } else {
return -ENODEV; map_destroy(mymtd);
iounmap(sharpsl_map.virt);
return -ENODEV;
}
parts = sharpsl_partitions; parts = sharpsl_partitions;
nb_parts = NB_OF(sharpsl_partitions); nb_parts = NB_OF(sharpsl_partitions);