Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 9a9902c56ae7..d5be25987142 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -52,10 +52,7 @@ struct video_device *video_device_alloc(void)
 {
         struct video_device *vfd;
 
-        vfd = kmalloc(sizeof(*vfd),GFP_KERNEL);
-        if (NULL == vfd)
-                return NULL;
-        memset(vfd,0,sizeof(*vfd));
+        vfd = kzalloc(sizeof(*vfd),GFP_KERNEL);
         return vfd;
 }