From 52f2f37477affbbd416b27f051b2be9d87891dcd Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 27 Jul 2015 09:59:04 +0200 Subject: [PATCH] fbset: fix rgba parsing In commit b5c7220e7b2b6611fe5beca494c67bfe51fcfafb "fbset: respect rgba configuration lines in fb.modes" I somehow managed to swap the offset/length markers around. The man page for fb.modes says it should be offset/length not length/offset as I was accidentally parsing it. As my fb.modes file was also reversed I didn't notice until I tried someone elses fb.modes file. Mea culpa. Signed-off-by: Linus Walleij Signed-off-by: Denys Vlasenko --- util-linux/fbset.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 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;