summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-06-30 14:24:33 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-06-30 14:24:33 +0200
commitf4563213084baa6c5271a9967b4c3b2bd6b2d49d (patch)
tree4f75ee114b994bdc710312cdbfeeda2527c894ef
parent9a2a703e50e2370f6b1dcebc8cfd25ef9cc5a2e5 (diff)
parent119f92b27e131a0cb506fe8d8bffe8010fb14a3d (diff)
downloadbarebox-f4563213084baa6c5271a9967b4c3b2bd6b2d49d.tar.gz
Merge branch 'for-next/state'
-rw-r--r--common/state/backend_storage.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/state/backend_storage.c b/common/state/backend_storage.c
index 8d24f70..3249d0b 100644
--- a/common/state/backend_storage.c
+++ b/common/state/backend_storage.c
@@ -368,7 +368,6 @@ int state_storage_init(struct state *state, const char *path,
INIT_LIST_HEAD(&storage->buckets);
storage->dev = &state->dev;
- storage->name = storagetype;
storage->stridesize = stridesize;
storage->offset = offset;
storage->max_size = max_size;
@@ -380,8 +379,10 @@ int state_storage_init(struct state *state, const char *path,
if (!ret && !(meminfo.flags & MTD_NO_ERASE)) {
bool circular;
if (!storagetype || !strcmp(storagetype, "circular")) {
+ storage->name = "circular";
circular = true;
} else if (!strcmp(storagetype, "noncircular")) {
+ storage->name = "noncircular";
dev_warn(storage->dev, "using old format circular storage type.\n");
circular = false;
} else {