aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-07-27 09:59:04 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2015-07-30 03:05:46 +0200
commit52f2f37477affbbd416b27f051b2be9d87891dcd (patch)
tree6d47812b1f76702acbca46e97f3ed8056acd5179
parentc29021e2a594fb29471c8c7e61ab8f45296622ba (diff)
downloadbusybox-w32-52f2f37477affbbd416b27f051b2be9d87891dcd.tar.gz
busybox-w32-52f2f37477affbbd416b27f051b2be9d87891dcd.tar.bz2
busybox-w32-52f2f37477affbbd416b27f051b2be9d87891dcd.zip
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 <linus.walleij@linaro.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/fbset.c8
1 files 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,
349 int transp_offset, transp_length; 349 int transp_offset, transp_length;
350 350
351 sscanf(p, "%d/%d,%d/%d,%d/%d,%d/%d", 351 sscanf(p, "%d/%d,%d/%d,%d/%d,%d/%d",
352 &red_offset, &red_length, 352 &red_length, &red_offset,
353 &green_offset, &green_length, 353 &green_length, &green_offset,
354 &blue_offset, &blue_length, 354 &blue_length, &blue_offset,
355 &transp_offset, &transp_length); 355 &transp_length, &transp_offset);
356 base->red.offset = red_offset; 356 base->red.offset = red_offset;
357 base->red.length = red_length; 357 base->red.length = red_length;
358 base->red.msb_right = 0; 358 base->red.msb_right = 0;