diff options
| author | Gabor Juhos <juhosg@freemail.hu> | 2017-12-19 09:11:57 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2017-12-24 09:03:01 +0100 |
| commit | df68e63a4f297c85c240f670fded55d3d3387dc4 (patch) | |
| tree | 1856bd28d9e73c8ae341dd9229692117b3844ae3 | |
| parent | 975e9cd86663971850bbdfe46b2696e256ad13ac (diff) | |
| download | upstream-df68e63a4f297c85c240f670fded55d3d3387dc4.tar.gz upstream-df68e63a4f297c85c240f670fded55d3d3387dc4.tar.bz2 upstream-df68e63a4f297c85c240f670fded55d3d3387dc4.zip | |
kernel/4.14: add missing newline character to UBI messages
A few UBI messages lacks the trailing newline character which
leads to ugly lines in the bootlog like this:
[ 6.649159] UBI error: no valid UBI magic found inside mtd6[ 6.667751] Freeing unused kernel memory: 2196K
Add a newline character to the end of the messages to fix it.
After the fix the line from above looks better in the log:
[ 6.609182] UBI error: no valid UBI magic found inside mtd6
[ 6.627599] Freeing unused kernel memory: 2132K
Signed-off-by: Gabor Juhos <juhosg@freemail.hu>
| -rw-r--r-- | target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic/pending-4.14/494-mtd-ubi-add-EOF-marker-support.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index 523a69c873..180d1407d2 100644 --- a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -33,7 +33,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> + /* check for a valid ubi magic */ + err = mtd_read(mtd, 0, 4, &len, (void *) magic); + if (!err && len == 4 && strncmp(magic, "UBI#", 4)) { -+ pr_err("UBI error: no valid UBI magic found inside mtd%d", mtd->index); ++ pr_err("UBI error: no valid UBI magic found inside mtd%d\n", mtd->index); + put_mtd_device(mtd); + return; + } @@ -48,7 +48,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> + err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0); + mutex_unlock(&ubi_devices_mutex); + if (err < 0) { -+ pr_err("UBI error: cannot attach mtd%d", mtd->index); ++ pr_err("UBI error: cannot attach mtd%d\n", mtd->index); + put_mtd_device(mtd); + } + } diff --git a/target/linux/generic/pending-4.14/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/pending-4.14/494-mtd-ubi-add-EOF-marker-support.patch index 99cc0f6cdc..c8e25710b2 100644 --- a/target/linux/generic/pending-4.14/494-mtd-ubi-add-EOF-marker-support.patch +++ b/target/linux/generic/pending-4.14/494-mtd-ubi-add-EOF-marker-support.patch @@ -36,7 +36,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> + return err; + + if (ec_hdr_has_eof(ech)) { -+ pr_notice("UBI: EOF marker found, PEBs from %d will be erased", ++ pr_notice("UBI: EOF marker found, PEBs from %d will be erased\n", + pnum); + ai->eof_found = true; + } |