diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-06 23:44:06 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-06 23:44:06 +0100 |
| commit | f61f59da0fdcec37046680de3972709fe65282ac (patch) | |
| tree | ab8502828706fecf043c9d572a4dbf623caeac17 /common/cmd_ubi.c | |
| parent | 888279b5ed8a6243eda81af84a98adc64c5e4453 (diff) | |
| parent | 64b68178489b6845bcf460e9c6e618cb81740faf (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
Diffstat (limited to 'common/cmd_ubi.c')
| -rw-r--r-- | common/cmd_ubi.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 7692ac7716..b486ca8fef 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -42,6 +42,11 @@ struct selected_dev { static struct selected_dev ubi_dev; +#ifdef CONFIG_CMD_UBIFS +int ubifs_is_mounted(void); +void cmd_ubifs_umount(void); +#endif + static void ubi_dump_vol_info(const struct ubi_volume *vol) { ubi_msg("volume information dump:"); @@ -472,6 +477,16 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) if (argc < 3) return cmd_usage(cmdtp); +#ifdef CONFIG_CMD_UBIFS + /* + * Automatically unmount UBIFS partition when user + * changes the UBI device. Otherwise the following + * UBIFS commands will crash. + */ + if (ubifs_is_mounted()) + cmd_ubifs_umount(); +#endif + /* todo: get dev number for NAND... */ ubi_dev.nr = 0; |