diff options
author | Stefano Babic <sbabic@denx.de> | 2012-02-22 00:24:37 +0000 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2012-05-04 16:28:45 -0600 |
commit | ad7d899648147f8a65ee36b54d5c61fb3b374bd8 (patch) | |
tree | a1e1a3311b5bf7d032c304992db4d510b1019e90 | |
parent | 51b22adbde32e96807ac9a0657c0d31d77b94fa3 (diff) |
SATA: check for return value from sata functions
sata functions are called even if previous functions failed
because return value is not checked.
Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Dirk Behme <dirk.behme@de.bosch.com>
CC: Fabio Estevam <fabio.estevam@freescale.com>
-rw-r--r-- | common/cmd_sata.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/common/cmd_sata.c b/common/cmd_sata.c index 7b1703fe4..3f98235a3 100644 --- a/common/cmd_sata.c +++ b/common/cmd_sata.c @@ -48,9 +48,12 @@ int __sata_initialize(void) sata_dev_desc[i].block_write = sata_write; rc = init_sata(i); - rc = scan_sata(i); - if ((sata_dev_desc[i].lba > 0) && (sata_dev_desc[i].blksz > 0)) - init_part(&sata_dev_desc[i]); + if (!rc) { + rc = scan_sata(i); + if (!rc && (sata_dev_desc[i].lba > 0) && + (sata_dev_desc[i].blksz > 0)) + init_part(&sata_dev_desc[i]); + } } sata_curr_device = 0; return rc; |