diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-07 09:59:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-07 09:59:38 +0200 |
| commit | 5d834decbe062273393acfcf172fdd29ead6a166 (patch) | |
| tree | 1eeea5cf915f7779aaa77421327caaa7525e91e0 /drivers | |
| parent | 53adf0648c330357103e4a7103c3d7f05c0c4bcf (diff) | |
| parent | 7b3d284f4bad78d61e9f5d32ec5aa1efc19ce733 (diff) | |
| download | barebox-5d834decbe062273393acfcf172fdd29ead6a166.tar.gz barebox-5d834decbe062273393acfcf172fdd29ead6a166.tar.xz | |
Merge branch 'for-next/state'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/state.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/misc/state.c b/drivers/misc/state.c index b43aee60fe..98ed42e757 100644 --- a/drivers/misc/state.c +++ b/drivers/misc/state.c @@ -26,6 +26,7 @@ static int state_probe(struct device_d *dev) struct device_node *np = dev->device_node; struct state *state; bool readonly = false; + int ret; state = state_new_from_node(np, NULL, 0, 0, readonly); if (IS_ERR(state)) { @@ -35,6 +36,11 @@ static int state_probe(struct device_d *dev) return ret; } + ret = state_load(state); + if (ret) + dev_warn(dev, "Failed to load persistent state, continuing with defaults, %d\n", + ret); + return 0; } |