diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-13 22:03:03 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-13 22:03:03 +0200 |
| commit | 330da06a9a016d62af792707268c4a014cc199c5 (patch) | |
| tree | a98770348cbf9aeafac7d8651d433066cb71e39d | |
| parent | f9b932fed97dfebdc080a76ab91dd8d8a6afa70f (diff) | |
| parent | c48ca0d70c2c68fdf0b400d416a6203e4356a0d9 (diff) | |
| download | barebox-330da06a9a016d62af792707268c4a014cc199c5.tar.gz barebox-330da06a9a016d62af792707268c4a014cc199c5.tar.xz | |
Merge branch 'pu/parameter' into next
| -rw-r--r-- | include/param.h | 1 | ||||
| -rw-r--r-- | lib/parameter.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/param.h b/include/param.h index e7b66a4d68..a855102d15 100644 --- a/include/param.h +++ b/include/param.h @@ -14,7 +14,6 @@ struct param_d { int (*set)(struct device_d *, struct param_d *param, const char *val); unsigned int flags; char *name; - struct param_d *next; char *value; struct list_head list; }; diff --git a/lib/parameter.c b/lib/parameter.c index baf7720cb4..c75c21e768 100644 --- a/lib/parameter.c +++ b/lib/parameter.c @@ -135,7 +135,7 @@ int dev_param_set_generic(struct device_d *dev, struct param_d *p, static const char *param_get_generic(struct device_d *dev, struct param_d *p) { - return p->value; + return p->value ? p->value : ""; } static struct param_d *__dev_add_param(struct device_d *dev, const char *name, |