Merge branch 'busybox' into merge

2 files changed, 5 insertions, 5 deletions

diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index e9aacce4f..ac0082f70 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -349,10 +349,10 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn,
                         int transp_offset, transp_length;
 
                         sscanf(p, "%d/%d,%d/%d,%d/%d,%d/%d",
-                                &red_offset, &red_length,
-                                &green_offset, &green_length,
-                                &blue_offset, &blue_length,
-                                &transp_offset, &transp_length);
+                                &red_length, &red_offset,
+                                &green_length, &green_offset,
+                                &blue_length, &blue_offset,
+                                &transp_length, &transp_offset);
                         base->red.offset = red_offset;
                         base->red.length = red_length;
                         base->red.msb_right = 0;
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index ca4b91510..662e8ab38 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -471,7 +471,7 @@ static const struct rule *next_rule(void)
         if (G.parser) {
                 parse_next_rule();
                 if (G.rule_vec) { /* mdev -s */
-                        rule = memcpy(xmalloc(sizeof(G.cur_rule)), &G.cur_rule, sizeof(G.cur_rule));
+                        rule = xmemdup(&G.cur_rule, sizeof(G.cur_rule));
                         G.rule_vec = xrealloc_vector(G.rule_vec, 4, G.rule_idx);
                         G.rule_vec[G.rule_idx++] = rule;
                         dbg3("> G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);