diff options
author | Stefano Babic <sbabic@denx.de> | 2016-11-29 15:28:28 (GMT) |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2016-11-29 15:28:28 (GMT) |
commit | 2d221489df021393654805536be7effcb9d39702 (patch) | |
tree | 1b636f10b4ccde42624ec665df13288408b59b7f /cmd/sata.c | |
parent | 45a3ad81fafe3090f7f89b458f6bd9f547a453df (diff) | |
parent | e94793c844a40606252f2e3f6428063e057b3fd2 (diff) | |
download | u-boot-fsl-qoriq-2d221489df021393654805536be7effcb9d39702.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'cmd/sata.c')
-rw-r--r-- | cmd/sata.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -32,9 +32,12 @@ static int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } /* If the user has not yet run `sata init`, do it now */ - if (sata_curr_device == -1) - if (sata_initialize()) - return 1; + if (sata_curr_device == -1) { + rc = sata_initialize(); + if (rc == -1) + return rc; + sata_curr_device = rc; + } switch (argc) { case 0: |