summaryrefslogtreecommitdiff
path: root/drivers/media/pci/cx23885/cx23885-alsa.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-08-10 13:26:01 +0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-08 17:01:00 +0400
commit4d63a25c4523b5d18e5307897d56aff785f43bf5 (patch)
treeb17311a8d01f28fa57429e4031de00f60ff3067b /drivers/media/pci/cx23885/cx23885-alsa.c
parent96f233e97587a7f6c0f47476118cdb9a23a9ebe0 (diff)
downloadlinux-4d63a25c4523b5d18e5307897d56aff785f43bf5.tar.xz
[media] cx23885: remove btcx-risc dependency
It's just as easy to do it in the driver. This dependency only uses a fraction of the btcx-risc module and doing it directly in the driver adds only a few lines. The btcx-risc module is really meant for the bttv driver, not for other drivers. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885-alsa.c')
-rw-r--r--drivers/media/pci/cx23885/cx23885-alsa.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-alsa.c b/drivers/media/pci/cx23885/cx23885-alsa.c
index 1b162ee8c8c6..ae7c2e89ad1c 100644
--- a/drivers/media/pci/cx23885/cx23885-alsa.c
+++ b/drivers/media/pci/cx23885/cx23885-alsa.c
@@ -270,12 +270,15 @@ int cx23885_audio_irq(struct cx23885_dev *dev, u32 status, u32 mask)
static int dsp_buffer_free(struct cx23885_audio_dev *chip)
{
+ struct cx23885_riscmem *risc;
+
BUG_ON(!chip->dma_size);
dprintk(2, "Freeing buffer\n");
cx23885_alsa_dma_unmap(chip);
cx23885_alsa_dma_free(chip->buf);
- btcx_riscmem_free(chip->pci, &chip->buf->risc);
+ risc = &chip->buf->risc;
+ pci_free_consistent(chip->pci, risc->size, risc->cpu, risc->dma);
kfree(chip->buf);
chip->buf = NULL;