On 05/03/14 17:56, Wang YanQing wrote:
> Because uvesafb_vbe_init will fail when get zero avaiable modes,
> and we have checked the return value of uvesafb_vbe_init_mode,
> so it is impossible to pass NULL as mode into uvesafb_init_info.
>
> [ This patch fix warning report by fengguang.wu@xxxxxxxxx
> "drivers/video/fbdev/uvesafb.c:1509 uvesafb_init_info()
> error: we previously assumed 'mode' could be null" ]
>
> Signed-off-by: Wang YanQing <udknight@xxxxxxxxx>
> ---
> drivers/video/fbdev/uvesafb.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
> index 18352b2..509d452 100644
> --- a/drivers/video/fbdev/uvesafb.c
> +++ b/drivers/video/fbdev/uvesafb.c
> @@ -1474,12 +1474,7 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
> * used video mode, i.e. the minimum amount of
> * memory we need.
> */
> - if (mode != NULL) {
> - size_vmode = info->var.yres * mode->bytes_per_scan_line;
> - } else {
> - size_vmode = info->var.yres * info->var.xres *
> - ((info->var.bits_per_pixel + 7) >> 3);
> - }
> + size_vmode = info->var.yres * mode->bytes_per_scan_line;
>
> /*
> * size_total -- all video memory we have. Used for mtrr
>
Thanks, queuing for 3.15.
Tomi
Attachment:
signature.asc
Description: OpenPGP digital signature
