From 7274b06b8e44369f2998a3fd34c49249585cdc7a Mon Sep 17 00:00:00 2001 From: roel kluin Date: Tue, 6 Jan 2009 14:42:31 -0800 Subject: [PATCH] --- yaml --- r: 126384 b: refs/heads/master c: 6405141fb3d06ec4a50d054a113e3317cad054f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/gbefb.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e815ed5f8fcb..abb2f260d459 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08cc6341cc04fad45c28995db796317b5b413045 +refs/heads/master: 6405141fb3d06ec4a50d054a113e3317cad054f9 diff --git a/trunk/drivers/video/gbefb.c b/trunk/drivers/video/gbefb.c index f89c3cce1e0c..fe5b519860b1 100644 --- a/trunk/drivers/video/gbefb.c +++ b/trunk/drivers/video/gbefb.c @@ -912,6 +912,7 @@ static int gbefb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) { unsigned int line_length; struct gbe_timing_info timing; + int ret; /* Limit bpp to 8, 16, and 32 */ if (var->bits_per_pixel <= 8) @@ -930,8 +931,10 @@ static int gbefb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) var->grayscale = 0; /* No grayscale for now */ - if ((var->pixclock = compute_gbe_timing(var, &timing)) < 0) - return(-EINVAL); + ret = compute_gbe_timing(var, &timing); + var->pixclock = ret; + if (ret < 0) + return -EINVAL; /* Adjust virtual resolution, if necessary */ if (var->xres > var->xres_virtual || (!ywrap && !ypan))