diff options
| author | DENG Qingfang <dengqf6@mail2.sysu.edu.cn> | 2019-08-07 03:59:13 +0800 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-27 10:31:06 +0200 |
| commit | c03765e87a42a0ee4897b62d098686c65ab623af (patch) | |
| tree | 845f94030fd94ed5fca6acc1f44c6e71e5f65eb8 /package/utils/mtd-utils/patches/200-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch | |
| parent | 8fba3ebe889664dae421e03daf9c545c05d3e692 (diff) | |
| download | upstream-c03765e87a42a0ee4897b62d098686c65ab623af.tar.gz upstream-c03765e87a42a0ee4897b62d098686c65ab623af.tar.bz2 upstream-c03765e87a42a0ee4897b62d098686c65ab623af.zip | |
mtd-utils: update to 2.1.1
Removed upstream patch
Compile and run tested on mvebu
Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
(cherry picked from commit fb57c617ba5269a6c2050e42b9d68813e262bf0d)
Diffstat (limited to 'package/utils/mtd-utils/patches/200-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch')
| -rw-r--r-- | package/utils/mtd-utils/patches/200-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/package/utils/mtd-utils/patches/200-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch b/package/utils/mtd-utils/patches/200-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch deleted file mode 100644 index 79695c4954..0000000000 --- a/package/utils/mtd-utils/patches/200-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7d27becbb355853ba778e8b83fe171eecb8195d2 Mon Sep 17 00:00:00 2001 -From: Christian Lamparter <chunkeey@gmail.com> -Date: Thu, 7 Jun 2018 22:36:19 +0200 -Subject: [PATCH] Revert "Return correct error number in ubi_get_vol_info1" - -This reverts commit dede98ffb706676309488d7cc660f569548d5930. ---- - lib/libubi.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/lib/libubi.c b/lib/libubi.c -index b50e68a..978b433 100644 ---- a/lib/libubi.c -+++ b/lib/libubi.c -@@ -1240,11 +1240,8 @@ int ubi_get_vol_info1(libubi_t desc, int dev_num, int vol_id, - info->dev_num = dev_num; - info->vol_id = vol_id; - -- if (vol_get_major(lib, dev_num, vol_id, &info->major, &info->minor)) { -- if (errno == ENOENT) -- errno = ENODEV; -+ if (vol_get_major(lib, dev_num, vol_id, &info->major, &info->minor)) - return -1; -- } - - ret = vol_read_data(lib->vol_type, dev_num, vol_id, buf, 50); - if (ret < 0) --- -2.17.1 - |