sugar/linux
1
0
Fork 0
Code Activity

[media] cx23885: remove btcx-risc dependency

Browse Source 
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>
This commit is contained in:
Hans Verkuil
2014-08-10 06:26:01 -03:00
committed by Mauro Carvalho Chehab
parent 96f233e975
commit 4d63a25c45
5 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/pci/cx23885/cx23885-alsa.c
View File

@@ -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;