A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse source
This commit is contained in:
David Woodhouse 2007-01-18 10:34:51 +11:00
commit 9cdf083f98
5553 changed files with 242139 additions and 121732 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/mtd/devices/m25p80.c
View file

@ -437,7 +437,7 @@ static int __devinit m25p_probe(struct spi_device *spi)
* or JEDEC get-id commands. Try them ...
*/
DEBUG(MTD_DEBUG_LEVEL1, "%s: no chip id\n",
flash->spi->dev.bus_id);
spi->dev.bus_id);
return -ENODEV;
}
@ -447,11 +447,11 @@ static int __devinit m25p_probe(struct spi_device *spi)
}
if (i == ARRAY_SIZE(m25p_data)) {
DEBUG(MTD_DEBUG_LEVEL1, "%s: unrecognized id %s\n",
flash->spi->dev.bus_id, data->type);
spi->dev.bus_id, data->type);
return -ENODEV;
}
flash = kzalloc(sizeof *flash, SLAB_KERNEL);
flash = kzalloc(sizeof *flash, GFP_KERNEL);
if (!flash)
return -ENOMEM;

4
drivers/mtd/devices/mtd_dataflash.c
View file

@ -459,7 +459,7 @@ add_dataflash(struct spi_device *spi, char *name,
struct mtd_info *device;
struct flash_platform_data *pdata = spi->dev.platform_data;
priv = (struct dataflash *) kzalloc(sizeof *priv, GFP_KERNEL);
priv = kzalloc(sizeof *priv, GFP_KERNEL);
if (!priv)
return -ENOMEM;
@ -536,7 +536,7 @@ static int __devinit dataflash_probe(struct spi_device *spi)
if (status <= 0 || status == 0xff) {
DEBUG(MTD_DEBUG_LEVEL1, "%s: status error %d\n",
spi->dev.bus_id, status);
if (status == 0xff)
if (status == 0 || status == 0xff)
status = -ENODEV;
return status;
}

2
drivers/mtd/maps/Kconfig
View file

@ -590,7 +590,7 @@ config MTD_BAST_MAXSIZE
default "4"
config MTD_SHARP_SL
bool "ROM maped on Sharp SL Series"
bool "ROM mapped on Sharp SL Series"
depends on MTD && ARCH_PXA
help
This enables access to the flash chip on the Sharp SL Series of PDAs.

2
drivers/mtd/maps/cfi_flagadm.c
View file

@ -80,7 +80,7 @@ struct mtd_partition flagadm_parts[] = {
.size = FLASH_PARTITION2_SIZE
},
{
.name = "Persistant storage",
.name = "Persistent storage",
.offset = FLASH_PARTITION3_ADDR,
.size = FLASH_PARTITION3_SIZE
}

2
drivers/mtd/rfd_ftl.c
View file

@ -768,7 +768,7 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
if (mtd->type != MTD_NORFLASH)
return;
part = kcalloc(1, sizeof(struct partition), GFP_KERNEL);
part = kzalloc(sizeof(struct partition), GFP_KERNEL);
if (!part)
return;