---

yaml --- r: 367185 b: refs/heads/master c: 486a7a2 h: refs/heads/master i: 367183: 300f7a8 v: v3
git-mirror · Apr 16, 2013 · 389a968 · 389a968
1 parent 55e97b3
commit 389a968
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea3f7ac6e931f9aaa45e0a8445406f14e2a62011
+refs/heads/master: 486a7a2813c7d6e0b864c4b51027bcae3359071e
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-audio-upstream.o
+		       cx25821-video.o cx25821-video-upstream.o
 
 obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
 obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o

diff --git a/trunk/drivers/media/pci/cx25821/cx25821-core.c b/trunk/drivers/media/pci/cx25821/cx25821-core.c
@@ -964,8 +964,6 @@ void cx25821_dev_unregister(struct cx25821_dev *dev)
 	if (!dev->base_io_addr)
 		return;
 
-	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++) {