[media] cx25821: remove cx25821-audio-upstream.c from the Makefile

The audio output is currently not used as this should be rewritten as an
alsa driver. For the time being remove this source from the Makefile.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/pci/cx25821/Makefile b/drivers/media/pci/cx25821/Makefile
index 407830c89df43ce1f5d47c9de8ca7391619ba4ab..fb76c3d3713a63ffe9982e2c39ce6af8bac21c64 100644 (file)
--- a/drivers/media/pci/cx25821/Makefile
+++ b/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/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c
index 35bea792b5e4b766e7ce2fb92b337581f068594d..b762c5b2ca100306e1638969c4538ad79a6c03a7 100644 (file)
--- 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)
        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++) {