diff options
Diffstat (limited to 'drivers/media/video/zoran_card.c')
-rw-r--r-- | drivers/media/video/zoran_card.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c index 39a0d238900e..ea3288661a34 100644 --- a/drivers/media/video/zoran_card.c +++ b/drivers/media/video/zoran_card.c | |||
@@ -1050,7 +1050,7 @@ zr36057_init (struct zoran *zr) | |||
1050 | /* allocate memory *before* doing anything to the hardware | 1050 | /* allocate memory *before* doing anything to the hardware |
1051 | * in case allocation fails */ | 1051 | * in case allocation fails */ |
1052 | mem_needed = BUZ_NUM_STAT_COM * 4; | 1052 | mem_needed = BUZ_NUM_STAT_COM * 4; |
1053 | mem = (unsigned long) kmalloc(mem_needed, GFP_KERNEL); | 1053 | mem = kzalloc(mem_needed, GFP_KERNEL); |
1054 | vdev = (void *) kmalloc(sizeof(struct video_device), GFP_KERNEL); | 1054 | vdev = (void *) kmalloc(sizeof(struct video_device), GFP_KERNEL); |
1055 | if (!mem || !vdev) { | 1055 | if (!mem || !vdev) { |
1056 | dprintk(1, | 1056 | dprintk(1, |
@@ -1061,7 +1061,6 @@ zr36057_init (struct zoran *zr) | |||
1061 | kfree((void *)mem); | 1061 | kfree((void *)mem); |
1062 | return -ENOMEM; | 1062 | return -ENOMEM; |
1063 | } | 1063 | } |
1064 | memset((void *) mem, 0, mem_needed); | ||
1065 | zr->stat_com = (u32 *) mem; | 1064 | zr->stat_com = (u32 *) mem; |
1066 | for (j = 0; j < BUZ_NUM_STAT_COM; j++) { | 1065 | for (j = 0; j < BUZ_NUM_STAT_COM; j++) { |
1067 | zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */ | 1066 | zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */ |