[media] cx25821: drop cx25821-video-upstream-ch2.c/h

[karo-tx-linux.git] / drivers / media / pci / cx25821 / cx25821-core.c

diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c
index 9068d53a5b8f995d052c3f7e217be08b47431211..230bd86415761d5a0c0c1fcea961f747d16a57a9 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-core.c
+++ b/drivers/media/pci/cx25821/cx25821-core.c
@@ -963,8 +963,6 @@ 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));
@@ -972,6 +970,8 @@ void cx25821_dev_unregister(struct cx25821_dev *dev)
        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);
        }