adm5120: merge 3.3 patches

SVN-Revision: 31511
This commit is contained in:
Gabor Juhos
2012-04-29 07:36:43 +00:00
parent 19be4923e0
commit e96d52d198
38 changed files with 223 additions and 1919 deletions

View File

@@ -144,7 +144,7 @@ static void trxsplit_create_partitions(struct mtd_info *mtd)
part = &trx_parts[i];
part->name = "rootfs";
err = add_mtd_partitions(mtd, trx_parts, trx_nr_parts);
err = mtd_device_register(mtd, trx_parts, trx_nr_parts);
if (err) {
printk(KERN_ALERT PFX "adding TRX partitions failed\n");
return;
@@ -159,7 +159,7 @@ static int trxsplit_refresh_partitions(struct mtd_info *mtd)
mtd->name, MTD_BLOCK_MAJOR, mtd->index);
/* remove old partitions */
del_mtd_partitions(mtd);
mtd_device_unregister(mtd);
trxsplit_findtrx(mtd);
if (!trx_mtd)