Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / drivers / char / mspec.c

diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c
index 966a95bc974b2c0489c7c4f33b52d1b3872238a0..25d139c9dbeddd86440847f3ced302950883ef98 100644 (file)
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
@@ -271,14 +271,13 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma,
        pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
        vdata_size = sizeof(struct vma_data) + pages * sizeof(long);
        if (vdata_size <= PAGE_SIZE)
-               vdata = kmalloc(vdata_size, GFP_KERNEL);
+               vdata = kzalloc(vdata_size, GFP_KERNEL);
        else {
-               vdata = vmalloc(vdata_size);
+               vdata = vzalloc(vdata_size);
                flags = VMD_VMALLOCED;
        }
        if (!vdata)
                return -ENOMEM;
-       memset(vdata, 0, vdata_size);
 
        vdata->vm_start = vma->vm_start;
        vdata->vm_end = vma->vm_end;