diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-07 08:23:45 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-07 08:23:45 +0200 |
| commit | c8fa7eed6695fb261cdeba49136ac8611e409952 (patch) | |
| tree | 43aa2bc1ee12777cb4937ed3a70cad4e12ce3d92 /common | |
| parent | 7bf2e891a4909f1cd4c765761b05984b5ff962bb (diff) | |
| parent | 1c9e671462ad4f4e294e962417e122da2a762e65 (diff) | |
| download | barebox-c8fa7eed6695fb261cdeba49136ac8611e409952.tar.gz barebox-c8fa7eed6695fb261cdeba49136ac8611e409952.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'common')
| -rw-r--r-- | common/blspec.c | 2 | ||||
| -rw-r--r-- | common/console_common.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/blspec.c b/common/blspec.c index ab18602715..d5ddb4fbbd 100644 --- a/common/blspec.c +++ b/common/blspec.c @@ -646,7 +646,7 @@ static int blspec_append_root(struct blspec_entry *entry) rootarg = path_get_linux_rootarg(entry->rootpath); if (IS_ERR(rootarg)) { pr_err("Getting root argument for %s failed with: %s\n", - entry->rootpath, strerror(-PTR_ERR(rootarg))); + entry->rootpath, strerrorp(rootarg)); return PTR_ERR(rootarg); } diff --git a/common/console_common.c b/common/console_common.c index fcf89e8568..a9bbce9a28 100644 --- a/common/console_common.c +++ b/common/console_common.c @@ -105,7 +105,7 @@ nolog: int pr_print(int level, const char *fmt, ...) { va_list args; - uint i; + int i; char printbuffer[CFG_PBSIZE]; if (!IS_ENABLED(CONFIG_LOGBUF) && level > barebox_loglevel) @@ -191,7 +191,7 @@ void log_print(unsigned flags) int printf(const char *fmt, ...) { va_list args; - uint i; + int i; char printbuffer[CFG_PBSIZE]; va_start(args, fmt); @@ -212,7 +212,7 @@ EXPORT_SYMBOL(printf); int vprintf(const char *fmt, va_list args) { - uint i; + int i; char printbuffer[CFG_PBSIZE]; /* |