Merge branch 'next' of git://git.denx.de/u-boot-usb into next

[oweals/u-boot.git] / cmd / sata.c

diff --git a/cmd/sata.c b/cmd/sata.c
index 6d62ba8f74aaceb9702d9db361e68966b89b304a..6bdb516cb5d0cd3c71fb608c063eb0dfea6acbde 100644 (file)
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -26,6 +26,8 @@ int sata_remove(int devnum)
        struct udevice *dev;
        int rc;
 
+       blk_unbind_all(IF_TYPE_SATA);
+
        rc = uclass_find_device(UCLASS_AHCI, devnum, &dev);
        if (!rc && !dev)
                rc = uclass_find_first_device(UCLASS_AHCI, &dev);
@@ -60,6 +62,10 @@ int sata_probe(int devnum)
                printf("Cannot probe SATA device %d (err=%d)\n", devnum, rc);
                return CMD_RET_FAILURE;
        }
+       if (!dev) {
+               printf("No SATA device found!\n");
+               return CMD_RET_FAILURE;
+       }
        rc = sata_scan(dev);
        if (rc) {
                printf("Cannot scan SATA device %d (err=%d)\n", devnum, rc);