aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zr36060.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/zr36060.c')
-rw-r--r--drivers/media/video/zr36060.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c
index 129744a07abd..28fa31a5f150 100644
--- a/drivers/media/video/zr36060.c
+++ b/drivers/media/video/zr36060.c
@@ -919,12 +919,11 @@ zr36060_setup (struct videocodec *codec)
919 return -ENOSPC; 919 return -ENOSPC;
920 } 920 }
921 //mem structure init 921 //mem structure init
922 codec->data = ptr = kmalloc(sizeof(struct zr36060), GFP_KERNEL); 922 codec->data = ptr = kzalloc(sizeof(struct zr36060), GFP_KERNEL);
923 if (NULL == ptr) { 923 if (NULL == ptr) {
924 dprintk(1, KERN_ERR "zr36060: Can't get enough memory!\n"); 924 dprintk(1, KERN_ERR "zr36060: Can't get enough memory!\n");
925 return -ENOMEM; 925 return -ENOMEM;
926 } 926 }
927 memset(ptr, 0, sizeof(struct zr36060));
928 927
929 snprintf(ptr->name, sizeof(ptr->name), "zr36060[%d]", 928 snprintf(ptr->name, sizeof(ptr->name), "zr36060[%d]",
930 zr36060_codecs); 929 zr36060_codecs);