diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-08-29 10:40:47 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-03 11:28:30 +0100 |
| commit | 999b3ceb849b5b9ed25739fea2e69adef09845c7 (patch) | |
| tree | b75bdc12be8f02998d4bceb460415eef6693cac3 /drivers/media/pci/cx88/cx88-mpeg.c | |
| parent | [media] cx88: return proper errors during fw load (diff) | |
| download | linux-999b3ceb849b5b9ed25739fea2e69adef09845c7.tar.xz linux-999b3ceb849b5b9ed25739fea2e69adef09845c7.zip | |
[media] cx88: drop cx88_free_buffer
Remove this function. This makes all vb2 queues behave the same, which
simplifies comparing the various vb2 queue op implementations.
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/cx88/cx88-mpeg.c')
| -rw-r--r-- | drivers/media/pci/cx88/cx88-mpeg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c index 7986ee037b83..0589dccae3bd 100644 --- a/drivers/media/pci/cx88/cx88-mpeg.c +++ b/drivers/media/pci/cx88/cx88-mpeg.c @@ -238,8 +238,12 @@ int cx8802_buf_prepare(struct vb2_queue *q, struct cx8802_dev *dev, if (!rc) return -EIO; - cx88_risc_databuffer(dev->pci, &buf->risc, sgt->sgl, + rc = cx88_risc_databuffer(dev->pci, &buf->risc, sgt->sgl, dev->ts_packet_size, dev->ts_packet_count, 0); + if (rc) { + btcx_riscmem_free(dev->pci, &buf->risc); + return rc; + } return 0; } |