Merge git://git.denx.de/u-boot-mpc85xx

[people/ms/u-boot.git] / cmd / sata.c

diff --git a/cmd/sata.c b/cmd/sata.c
index f56622acc2ccb794d947b7e2b8c9dd85cf3f4306..4c53022ff60a365ea030e80c3e9b112d55f9b50f 100644 (file)
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -28,14 +28,15 @@ static int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                if (sata_curr_device != -1)
                        sata_stop();
 
-               return sata_initialize();
+               return (sata_initialize() < 0) ?
+                       CMD_RET_FAILURE : CMD_RET_SUCCESS;
        }
 
        /* If the user has not yet run `sata init`, do it now */
        if (sata_curr_device == -1) {
                rc = sata_initialize();
                if (rc == -1)
-                       return rc;
+                       return CMD_RET_FAILURE;
                sata_curr_device = rc;
        }