---

yaml --- r: 367183 b: refs/heads/master c: 7087d31 h: refs/heads/master i: 367181: e1d55a1 367179: 2899cd8 367175: 3543ac9 367167: ced5d21 v: v3
git-mirror · Apr 16, 2013 · 300f7a8 · 300f7a8
1 parent ace2ebb
commit 300f7a8
Show file tree

Hide file tree

Showing 8 changed files with 244 additions and 1,196 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e90878ab151f733b67d725a1e1e5aee04f431ce5
+refs/heads/master: 7087d31b0c9dddbca71b8e33d3f0a3b719afa397
diff --git a/trunk/drivers/media/pci/cx25821/Makefile b/trunk/drivers/media/pci/cx25821/Makefile
@@ -1,7 +1,6 @@
 cx25821-y   := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
 		       cx25821-gpio.o cx25821-medusa-video.o \
 		       cx25821-video.o cx25821-video-upstream.o \
-		       cx25821-video-upstream-ch2.o \
 		       cx25821-audio-upstream.o
 
 obj-$(CONFIG_VIDEO_CX25821) += cx25821.o

diff --git a/trunk/drivers/media/pci/cx25821/cx25821-core.c b/trunk/drivers/media/pci/cx25821/cx25821-core.c
@@ -963,15 +963,15 @@ void cx25821_dev_unregister(struct cx25821_dev *dev)
 	if (!dev->base_io_addr)
 		return;
 
-	cx25821_free_mem_upstream_ch1(dev);
-	cx25821_free_mem_upstream_ch2(dev);
 	cx25821_free_mem_upstream_audio(dev);
 
 	release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0));
 
 	for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; i++) {
 		if (i == SRAM_CH08) /* audio channel */
 			continue;
+		if (i == SRAM_CH09 || i == SRAM_CH10)
+			cx25821_free_mem_upstream(&dev->channels[i]);
 		cx25821_video_unregister(dev, i);
 	}