Merge master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / video / fbcvt.c

diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c
index 0b6af00..ac90883 100644 (file)
--- a/drivers/video/fbcvt.c
+++ b/drivers/video/fbcvt.c
@@ -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;