From 1cfce74fe5a2301ee9b384d9395ba95db930c9d6 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 24 Aug 2016 09:46:32 -0700 Subject: [PATCH] nand: Fix set_dev checks for no device If we do nand device 0 command in u-boot on a device that has NAND support enabled but no NAND chip, we can get data abort at least on omaps. Fix the issue by replacing the check with nand_info[dev] as suggested by Scott Wood. The check for name existed before because before the array-to-pointer conversion there was no way to directly test nand_info[dev] for emptiness. Signed-off-by: Tony Lindgren --- cmd/nand.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/nand.c b/cmd/nand.c index e10349ac2b..97f1619ffd 100644 --- a/cmd/nand.c +++ b/cmd/nand.c @@ -115,8 +115,7 @@ free_dat: static int set_dev(int dev) { - if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE || - !nand_info[dev]->name) { + if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[dev]) { puts("No such device\n"); return -1; } -- 2.25.1