summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2016-08-29 09:11:43 -0700
committerScott Wood <oss@buserror.net>2016-09-01 17:30:25 -0500
commit4004a81828c72311f9c310c38d903b3f6638465d (patch)
treef7ca138a7dd0542b8bd1be227f0f993b15f5cd3f /cmd
parent91395b5d4ebb07bf6488058f0ba37256856816f6 (diff)
downloadu-boot-4004a81828c72311f9c310c38d903b3f6638465d.tar.gz
nand: Fix nand info for no device
Looks like we have few more places where we're testing for nand_info[i]->name. We can now use just test for nand_info[i] instead. This fixes a data abort on devices with no NAND when doing nand info. Signed-off-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/nand.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/nand.c b/cmd/nand.c
index 97f1619ffd..c25e25af3d 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -398,7 +398,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
putc('\n');
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
- if (nand_info[i]->name)
+ if (nand_info[i])
nand_print_and_set_info(i);
}
return 0;
@@ -433,7 +433,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
* for another device is to be used.
*/
if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE ||
- !nand_info[dev]->name) {
+ !nand_info[dev]) {
puts("\nno devices available\n");
return 1;
}
@@ -991,7 +991,7 @@ usage:
idx = simple_strtoul(boot_device, NULL, 16);
- if (idx < 0 || idx >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[idx]->name) {
+ if (idx < 0 || idx >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[idx]) {
printf("\n** Device %d not available\n", idx);
bootstage_error(BOOTSTAGE_ID_NAND_AVAILABLE);
return 1;