diff options
Diffstat (limited to 'drivers/video/vermilion/vermilion.c')
-rw-r--r-- | drivers/video/vermilion/vermilion.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c index 1c656667b937..2aa71eb67c2b 100644 --- a/drivers/video/vermilion/vermilion.c +++ b/drivers/video/vermilion/vermilion.c | |||
@@ -651,7 +651,7 @@ static int vmlfb_check_var_locked(struct fb_var_screeninfo *var, | |||
651 | return -EINVAL; | 651 | return -EINVAL; |
652 | } | 652 | } |
653 | 653 | ||
654 | pitch = __ALIGN_MASK((var->xres * var->bits_per_pixel) >> 3, 0x3F); | 654 | pitch = ALIGN((var->xres * var->bits_per_pixel) >> 3, 0x40); |
655 | mem = pitch * var->yres_virtual; | 655 | mem = pitch * var->yres_virtual; |
656 | if (mem > vinfo->vram_contig_size) { | 656 | if (mem > vinfo->vram_contig_size) { |
657 | return -ENOMEM; | 657 | return -ENOMEM; |
@@ -785,8 +785,7 @@ static int vmlfb_set_par_locked(struct vml_info *vinfo) | |||
785 | int clock; | 785 | int clock; |
786 | 786 | ||
787 | vinfo->bytes_per_pixel = var->bits_per_pixel >> 3; | 787 | vinfo->bytes_per_pixel = var->bits_per_pixel >> 3; |
788 | vinfo->stride = | 788 | vinfo->stride = ALIGN(var->xres_virtual * vinfo->bytes_per_pixel, 0x40); |
789 | __ALIGN_MASK(var->xres_virtual * vinfo->bytes_per_pixel, 0x3F); | ||
790 | info->fix.line_length = vinfo->stride; | 789 | info->fix.line_length = vinfo->stride; |
791 | 790 | ||
792 | if (!subsys) | 791 | if (!subsys) |