projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmd: binop: Use hex2bin
[oweals/u-boot.git]
/
cmd
/
sata.c
diff --git
a/cmd/sata.c
b/cmd/sata.c
index cc12afb07e697728dce15460fd3189d3d44d5ddf..a73cc54bd3e97b7ad535a52fc153697e74e37e69 100644
(file)
--- a/
cmd/sata.c
+++ b/
cmd/sata.c
@@
-51,7
+51,6
@@
int sata_probe(int devnum)
{
#ifdef CONFIG_AHCI
struct udevice *dev;
{
#ifdef CONFIG_AHCI
struct udevice *dev;
- struct udevice *blk;
int rc;
rc = uclass_get_device(UCLASS_AHCI, devnum, &dev);
int rc;
rc = uclass_get_device(UCLASS_AHCI, devnum, &dev);
@@
-61,20
+60,16
@@
int sata_probe(int devnum)
printf("Cannot probe SATA device %d (err=%d)\n", devnum, rc);
return CMD_RET_FAILURE;
}
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);
return CMD_RET_FAILURE;
}
rc = sata_scan(dev);
if (rc) {
printf("Cannot scan SATA device %d (err=%d)\n", devnum, rc);
return CMD_RET_FAILURE;
}
- rc = blk_get_from_parent(dev, &blk);
- if (!rc) {
- struct blk_desc *desc = dev_get_uclass_platdata(blk);
-
- if (desc->lba > 0 && desc->blksz > 0)
- part_init(desc);
- }
-
return 0;
#else
return sata_initialize() < 0 ? CMD_RET_FAILURE : CMD_RET_SUCCESS;
return 0;
#else
return sata_initialize() < 0 ? CMD_RET_FAILURE : CMD_RET_SUCCESS;
@@
-107,8
+102,8
@@
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) {
rc = sata_probe(0);
/* If the user has not yet run `sata init`, do it now */
if (sata_curr_device == -1) {
rc = sata_probe(0);
- if (rc
< 0
)
- return
CMD_RET_FAILURE
;
+ if (rc)
+ return
rc
;
sata_curr_device = 0;
}
sata_curr_device = 0;
}