diff options
author | Len Brown <len.brown@intel.com> | 2006-01-27 23:18:29 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-27 23:18:29 +0100 |
commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /drivers/video/fbcvt.c | |
parent | [ACPI] remove "Resource isn't an IRQ" warning (diff) | |
parent | [ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi bran... (diff) | |
download | linux-292dd876ee765c478b27c93cc51e93a558ed58bf.tar.xz linux-292dd876ee765c478b27c93cc51e93a558ed58bf.zip |
Pull release into acpica branch
Diffstat (limited to 'drivers/video/fbcvt.c')
-rw-r--r-- | drivers/video/fbcvt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c index 0b6af00d197e..ac90883dc3aa 100644 --- 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; |