diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-10-19 15:07:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-10-19 15:07:40 +0200 |
| commit | 7f04124c149fa4d8e8f657907c581f10987003e2 (patch) | |
| tree | d4f9c129f5ef7f4f28231766f449a12fb755b7e6 /common | |
| parent | 71d764a4b05d3ca4ec8d14f71c9149fd0023424e (diff) | |
| parent | 25c3fb28d8017595942115d4dbffc16d96f43930 (diff) | |
| download | barebox-7f04124c149fa4d8e8f657907c581f10987003e2.tar.gz barebox-7f04124c149fa4d8e8f657907c581f10987003e2.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'common')
| -rw-r--r-- | common/console_countdown.c | 14 | ||||
| -rw-r--r-- | common/imx-bbu-nand-fcb.c | 2 | ||||
| -rw-r--r-- | common/state/backend_bucket_circular.c | 2 | ||||
| -rw-r--r-- | common/state/backend_format_dtb.c | 2 | ||||
| -rw-r--r-- | common/state/backend_format_raw.c | 4 |
5 files changed, 9 insertions, 15 deletions
diff --git a/common/console_countdown.c b/common/console_countdown.c index 03b9b33538..36da1ce577 100644 --- a/common/console_countdown.c +++ b/common/console_countdown.c @@ -47,12 +47,14 @@ int console_countdown(int timeout_s, unsigned flags, char *out_key) do { if (tstc()) { key = getchar(); - if (flags & CONSOLE_COUNTDOWN_ANYKEY) - goto out; - if (flags & CONSOLE_COUNTDOWN_RETURN && key == '\n') - goto out; - if (flags & CONSOLE_COUNTDOWN_CTRLC && key == 3) - goto out; + if (key >= 0) { + if (flags & CONSOLE_COUNTDOWN_ANYKEY) + goto out; + if (flags & CONSOLE_COUNTDOWN_RETURN && key == '\n') + goto out; + if (flags & CONSOLE_COUNTDOWN_CTRLC && key == 3) + goto out; + } key = 0; } if ((flags & CONSOLE_COUNTDOWN_EXTERN) && diff --git a/common/imx-bbu-nand-fcb.c b/common/imx-bbu-nand-fcb.c index 7218c5e1cc..89b404884a 100644 --- a/common/imx-bbu-nand-fcb.c +++ b/common/imx-bbu-nand-fcb.c @@ -1126,7 +1126,7 @@ static void read_firmware_all(struct mtd_info *mtd, struct fcb_block *fcb, void fcb->Firmware1_startingPage + fcb->PagesInFirmware1, primary ? "" : "in", primary_refresh ? "needs cleanup" : "clean"); - pr_info("secondary firmware is on pages %d-%d, %svalid, %s\n", fcb->Firmware2_startingPage, + pr_info("Secondary firmware is on pages %d-%d, %svalid, %s\n", fcb->Firmware2_startingPage, fcb->Firmware2_startingPage + fcb->PagesInFirmware2, secondary ? "" : "in", secondary_refresh ? "needs cleanup" : "clean"); diff --git a/common/state/backend_bucket_circular.c b/common/state/backend_bucket_circular.c index f83bd679d7..2324903255 100644 --- a/common/state/backend_bucket_circular.c +++ b/common/state/backend_bucket_circular.c @@ -310,8 +310,6 @@ static int state_backend_bucket_circular_write(struct state_backend_storage_buck * random changes */ write_buf = xzalloc(written_length); - if (!write_buf) - return -ENOMEM; memcpy(write_buf, buf, len); meta = (struct state_backend_storage_bucket_circular_meta *) diff --git a/common/state/backend_format_dtb.c b/common/state/backend_format_dtb.c index 4c9d2eefc7..48f30db1f5 100644 --- a/common/state/backend_format_dtb.c +++ b/common/state/backend_format_dtb.c @@ -136,8 +136,6 @@ int backend_format_dtb_create(struct state_backend_format **format, struct state_backend_format_dtb *dtb; dtb = xzalloc(sizeof(*dtb)); - if (!dtb) - return -ENOMEM; dtb->dev = dev; dtb->format.pack = state_backend_format_dtb_pack; diff --git a/common/state/backend_format_raw.c b/common/state/backend_format_raw.c index 2ba97e08a0..4369f76e37 100644 --- a/common/state/backend_format_raw.c +++ b/common/state/backend_format_raw.c @@ -222,8 +222,6 @@ static int backend_format_raw_pack(struct state_backend_format *format, size_full = size_data + sizeof(*header) + backend_raw->digest_length; buf = xzalloc(size_full); - if (!buf) - return -ENOMEM; header = buf; data = buf + sizeof(*header); @@ -308,8 +306,6 @@ int backend_format_raw_create(struct state_backend_format **format, int ret; raw = xzalloc(sizeof(*raw)); - if (!raw) - return -ENOMEM; raw->dev = dev; ret = backend_format_raw_init_digest(raw, node, secret_name); |