From 7b8779541f86bbc6f6b461f1ea1c2f4310bb8335 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 8 Apr 2014 08:37:09 +0200 Subject: fb: Fix use of unitialized variable 'ret' is only initialized when info->fbops->fb_activate_var exists, so only use it in this case. Reported-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- drivers/video/fb.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/video/fb.c b/drivers/video/fb.c index 2c8b8eb25e..ecf6142c7a 100644 --- a/drivers/video/fb.c +++ b/drivers/video/fb.c @@ -85,8 +85,10 @@ static int fb_setup_mode(struct fb_info *info) if (info->fbops->fb_activate_var) { ret = info->fbops->fb_activate_var(info); - if (ret) + if (ret) { + info->cdev.size = 0; return ret; + } } if (!info->line_length) @@ -94,14 +96,11 @@ static int fb_setup_mode(struct fb_info *info) if (!info->screen_size) info->screen_size = info->line_length * info->yres; - if (!ret) { - dev->resource[0].start = (resource_size_t)info->screen_base; - info->cdev.size = info->line_length * info->yres; - dev->resource[0].end = dev->resource[0].start + info->cdev.size - 1; - } else - info->cdev.size = 0; + dev->resource[0].start = (resource_size_t)info->screen_base; + info->cdev.size = info->line_length * info->yres; + dev->resource[0].end = dev->resource[0].start + info->cdev.size - 1; - return ret; + return 0; } static int fb_set_modename(struct param_d *param, void *priv) -- cgit v1.2.3