diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-12-12 10:27:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-23 09:35:35 -0200 |
| commit | 5ede94c7055392bb55c6d2e26f1912f68ef4b875 (patch) | |
| tree | ee4a91eeb362cbf495a65517e9c2b6a9c0d7a0aa /drivers/media/pci/cx25821/cx25821-video.c | |
| parent | 5d0beeec59e303c76160ddd67fa73dcfc5d76de0 (diff) | |
| download | linux-5ede94c7055392bb55c6d2e26f1912f68ef4b875.tar.bz2 | |
[media] cx25821: remove bogus btcx_risc dependency
Those btcx_risc functions are meant for use with bttv, other drivers
should just allocate the memory themselves.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/cx25821/cx25821-video.c')
| -rw-r--r-- | drivers/media/pci/cx25821/cx25821-video.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c index 3a419f134584..3eda1a1e1e25 100644 --- a/drivers/media/pci/cx25821/cx25821-video.c +++ b/drivers/media/pci/cx25821/cx25821-video.c @@ -1017,11 +1017,13 @@ void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num) cx_clear(PCI_INT_MSK, 1); if (video_is_registered(&dev->channels[chan_num].vdev)) { + struct cx25821_riscmem *risc = + &dev->channels[chan_num].dma_vidq.stopper; + video_unregister_device(&dev->channels[chan_num].vdev); v4l2_ctrl_handler_free(&dev->channels[chan_num].hdl); - btcx_riscmem_free(dev->pci, - &dev->channels[chan_num].dma_vidq.stopper); + pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma); } } |