diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-09 14:17:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-09 14:17:06 +0200 |
| commit | a90a0bbf41e2fc251d31de604e06895ef1db05fa (patch) | |
| tree | 1dcd66396a2abf9ace3a61ce04722fed35ca3e41 /common/state/backend_bucket_circular.c | |
| parent | 091b51c0a9479d4d917d399e018f51db3d6332f9 (diff) | |
| parent | a8a03551034bee6d2a66fc514342664f760bb4b6 (diff) | |
| download | barebox-a90a0bbf41e2fc251d31de604e06895ef1db05fa.tar.gz barebox-a90a0bbf41e2fc251d31de604e06895ef1db05fa.tar.xz | |
Merge branch 'for-next/state'
Diffstat (limited to 'common/state/backend_bucket_circular.c')
| -rw-r--r-- | common/state/backend_bucket_circular.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/common/state/backend_bucket_circular.c b/common/state/backend_bucket_circular.c index 2324903255..933493e228 100644 --- a/common/state/backend_bucket_circular.c +++ b/common/state/backend_bucket_circular.c @@ -396,11 +396,13 @@ static int state_backend_bucket_circular_init( meta = (struct state_backend_storage_bucket_circular_meta *) (buf + sub_offset + circ->writesize - sizeof(*meta)); - if (meta->magic != circular_magic) + if (meta->magic != circular_magic) { written_length = 0; - else + if (meta->magic != ~0 && !!meta->magic) + bucket->wrong_magic = 1; + } else { written_length = meta->written_length; - + } break; } } |