aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/pci/cx25821/Makefile3
-rw-r--r--drivers/media/pci/cx25821/cx25821-core.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/pci/cx25821/Makefile b/drivers/media/pci/cx25821/Makefile
index 407830c89df4..fb76c3d3713a 100644
--- a/drivers/media/pci/cx25821/Makefile
+++ b/drivers/media/pci/cx25821/Makefile
@@ -1,7 +1,6 @@
1cx25821-y := cx25821-core.o cx25821-cards.o cx25821-i2c.o \ 1cx25821-y := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
2 cx25821-gpio.o cx25821-medusa-video.o \ 2 cx25821-gpio.o cx25821-medusa-video.o \
3 cx25821-video.o cx25821-video-upstream.o \ 3 cx25821-video.o cx25821-video-upstream.o
4 cx25821-audio-upstream.o
5 4
6obj-$(CONFIG_VIDEO_CX25821) += cx25821.o 5obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
7obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o 6obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c
index 35bea792b5e4..b762c5b2ca10 100644
--- a/drivers/media/pci/cx25821/cx25821-core.c
+++ b/drivers/media/pci/cx25821/cx25821-core.c
@@ -964,8 +964,6 @@ void cx25821_dev_unregister(struct cx25821_dev *dev)
964 if (!dev->base_io_addr) 964 if (!dev->base_io_addr)
965 return; 965 return;
966 966
967 cx25821_free_mem_upstream_audio(dev);
968
969 release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0)); 967 release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0));
970 968
971 for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; i++) { 969 for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; i++) {