diff options
| author | Emmanuel Vadot | 2016-10-19 17:19:47 +0200 |
|---|---|---|
| committer | Tom Rini | 2016-10-24 08:04:43 -0400 |
| commit | 5d81c6df320e40c741f474a54cc6df451e830143 (patch) | |
| tree | e9a77ecf671dafe29ecf87d9422c011118dddc87 | |
| parent | 0dbc9b591a56bc5a93455632de5e4d62c73e6ca5 (diff) | |
api: storage: Avoid enumeration for non-configured subsystem
If a subsystem wasn't configured, avoid enumeration.
Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com>
| -rw-r--r-- | api/api_storage.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/api/api_storage.c b/api/api_storage.c index d425a9ad1db..b5aaba1091e 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -41,7 +41,7 @@ struct stor_spec { char *name; }; -static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, }; +static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, NULL }, }; void dev_stor_init(void) @@ -105,6 +105,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di) struct blk_desc *dd; + /* Wasn't configured for this type, return 0 directly */ + if (specs[type].name == NULL) + return 0; + if (first) { di->cookie = (void *)blk_get_dev(specs[type].name, 0); if (di->cookie == NULL) |