Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / video / fbcvt.c

diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c
index 0b6af00..0847c5e 100644 (file)
--- a/drivers/video/fbcvt.c
+++ b/drivers/video/fbcvt.c
@@ -57,7 +57,7 @@ struct fb_cvt_data {
        u32 status;
 };
 
-static int fb_cvt_vbi_tab[] = {
+static const unsigned char fb_cvt_vbi_tab[] = {
        4,        /* 4:3      */
        5,        /* 16:9     */
        6,        /* 16:10    */
@@ -214,12 +214,11 @@ static void fb_cvt_print_name(struct fb_cvt_data *cvt)
 {
        u32 pixcount, pixcount_mod;
        int cnt = 255, offset = 0, read = 0;
-       u8 *buf = kmalloc(256, GFP_KERNEL);
+       u8 *buf = kzalloc(256, GFP_KERNEL);
 
        if (!buf)
                return;
 
-       memset(buf, 0, 256);
        pixcount = (cvt->xres * (cvt->yres/cvt->interlace))/1000000;
        pixcount_mod = (cvt->xres * (cvt->yres/cvt->interlace)) % 1000000;
        pixcount_mod /= 1000;
@@ -377,4 +376,3 @@ int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb)
 
        return 0;
 }
-EXPORT_SYMBOL(fb_find_mode_cvt);