---

yaml --- r: 138011 b: refs/heads/master c: 6da6bf5 h: refs/heads/master i: 138009: bb29e1c 138007: 06d41ce v: v3
git-mirror · Mar 30, 2009 · 4214a0f · 4214a0f
1 parent 6ca4d20
commit 4214a0f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eefe1010a4657959588afc7fb3551cfa4e8bb4a7
+refs/heads/master: 6da6bf5e43f409672f5525657ff59282e160c59f
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c
@@ -1066,6 +1066,7 @@ static void cx18_remove(struct pci_dev *pci_dev)
 {
 	struct v4l2_device *v4l2_dev = pci_get_drvdata(pci_dev);
 	struct cx18 *cx = to_cx18(v4l2_dev);
+	int i;
 
 	CX18_DEBUG_INFO("Removing Card\n");
 
@@ -1095,7 +1096,10 @@ static void cx18_remove(struct pci_dev *pci_dev)
 	release_mem_region(cx->base_addr, CX18_MEM_SIZE);
 
 	pci_disable_device(cx->pci_dev);
-	/* FIXME - we leak cx->vbi.sliced_mpeg_data[i] allocations */
+
+	if (cx->vbi.sliced_mpeg_data[0] != NULL)
+		for (i = 0; i < CX18_VBI_FRAMES; i++)
+			kfree(cx->vbi.sliced_mpeg_data[i]);
 
 	CX18_INFO("Removed %s\n", cx->card_name);