---

yaml --- r: 232250 b: refs/heads/master c: 6ce3ced h: refs/heads/master v: v3
git-mirror · Jan 19, 2011 · 4035cb7 · 4035cb7
1 parent e01737a
commit 4035cb7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd5ba3ba2ead7248124723dac2481d0992e75e91
+refs/heads/master: 6ce3ced4f73e3f0c345f47dc99fd21f2248724a8
diff --git a/trunk/drivers/media/video/zoran/zoran_card.c b/trunk/drivers/media/video/zoran/zoran_card.c
@@ -1041,7 +1041,7 @@ zr36057_init (struct zoran *zr)
 	/* allocate memory *before* doing anything to the hardware
 	 * in case allocation fails */
 	zr->stat_com = kzalloc(BUZ_NUM_STAT_COM * 4, GFP_KERNEL);
-	zr->video_dev = kmalloc(sizeof(struct video_device), GFP_KERNEL);
+	zr->video_dev = video_device_alloc();
 	if (!zr->stat_com || !zr->video_dev) {
 		dprintk(1,
 			KERN_ERR