Changeset View
Changeset View
Standalone View
Standalone View
head/sysutils/u-boot-cubieboard/files/patch-api_api__storage.c
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- api/api_storage.c.orig 2015-04-13 14:53:03 UTC | |||||
| +++ api/api_storage.c | |||||
| @@ -107,10 +107,13 @@ static int dev_stor_get(int type, int fi | |||||
| if (first) { | |||||
| di->cookie = (void *)get_dev(specs[type].name, 0); | |||||
| - if (di->cookie == NULL) | |||||
| + if (di->cookie == NULL) { | |||||
| return 0; | |||||
| - else | |||||
| + } else { | |||||
| found = 1; | |||||
| + if (specs[type].max_dev > 1) | |||||
| + *more = 1; | |||||
| + } | |||||
| } else { | |||||
| for (i = 0; i < specs[type].max_dev; i++) | |||||
| @@ -146,7 +149,8 @@ static int dev_stor_get(int type, int fi | |||||
| dd = (block_dev_desc_t *)di->cookie; | |||||
| if (dd->type == DEV_TYPE_UNKNOWN) { | |||||
| debugf("device instance exists, but is not active.."); | |||||
| - found = 0; | |||||
| + di->di_stor.block_count = 0; | |||||
| + di->di_stor.block_size = 0; | |||||
| } else { | |||||
| di->di_stor.block_count = dd->lba; | |||||
| di->di_stor.block_size = dd->blksz; | |||||