X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_sata.c;h=3f98235a38a6a0fa725ab1694285085e768f5e80;hb=94fd1316b75896b668d22ce846785d92c0340100;hp=7b1703fe4133df3866f023cdd45d7219026be791;hpb=4c12eeb8b55483e48ef98b8a480e2bbacc9f210d;p=u-boot

diff --git a/common/cmd_sata.c b/common/cmd_sata.c
index 7b1703fe41..3f98235a38 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;