[PATCH] fbset: fix rgba parsing

Denys Vlasenko vda.linux at googlemail.com
Thu Jul 30 01:06:14 UTC 2015


Applied, thanks!

On Mon, Jul 27, 2015 at 9:59 AM, Linus Walleij <linus.walleij at linaro.org> wrote:
> 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 at linaro.org>
> ---
>  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 e9aacce4f253..b5393e580ef0 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;
> --
> 2.4.3
>


More information about the busybox mailing list