diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-09-08 08:41:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-09-08 08:41:18 +0200 |
| commit | 682569d2be1de9e11363fc54953db5a1f2bb96aa (patch) | |
| tree | c6e1898a2665e1b3a88342f99b218fb47883cdc4 /common/bootchooser.c | |
| parent | 164ad51e6410d2439634a0a84a1d9b3dfeb08a0d (diff) | |
| parent | b67b8d92d770daf90f8efcfdfaa249bf048b53fa (diff) | |
| download | barebox-682569d2be1de9e11363fc54953db5a1f2bb96aa.tar.gz barebox-682569d2be1de9e11363fc54953db5a1f2bb96aa.tar.xz | |
Merge branch 'for-next/state'
Diffstat (limited to 'common/bootchooser.c')
| -rw-r--r-- | common/bootchooser.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/common/bootchooser.c b/common/bootchooser.c index 455f290fa2..83b15e0f78 100644 --- a/common/bootchooser.c +++ b/common/bootchooser.c @@ -367,18 +367,16 @@ struct bootchooser *bootchooser_get(void) char *state_devname; delim = strchr(state_prefix, '.'); - if (!delim) { - pr_err("state_prefix '%s' has invalid format\n", - state_prefix); - goto err; - } - state_devname = xstrndup(state_prefix, delim - state_prefix); + if (delim) + state_devname = xstrndup(state_prefix, delim - state_prefix); + else + state_devname = xstrdup(state_prefix); bc->state_prefix = xstrdup(state_prefix); bc->state = state_by_name(state_devname); if (!bc->state) { - free(state_devname); pr_err("Cannot get state '%s'\n", state_devname); + free(state_devname); ret = -ENODEV; goto err; } |