Removed upstream patch Compile and run tested on mvebu Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn> (cherry picked from commit fb57c617ba5269a6c2050e42b9d68813e262bf0d)master
parent
8fba3ebe88
commit
c03765e87a
@ -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
|
|
||||||
|
|
Loading…
Reference in new issue