diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-12-08 17:23:49 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-17 02:21:40 +0100 |
| commit | 165d00439fa9e9da7f263dc844cbd524cf624074 (patch) | |
| tree | 341fb85627d841edcc93175f12c3247ab40b444a /drivers/media/pci/cx88/cx88.h | |
| parent | [media] v4l2-ioctl: WARN_ON if querycap didn't fill device_caps (diff) | |
| download | linux-165d00439fa9e9da7f263dc844cbd524cf624074.tar.xz linux-165d00439fa9e9da7f263dc844cbd524cf624074.zip | |
[media] cx88: add missing alloc_ctx support
The cx88 vb2 conversion and the vb2 dma_sg improvements were developed separately and
were merged separately. Unfortunately, the patch updating drivers to the dma_sg
improvements didn't take the updated cx88 driver into account. Basically two ships
passing in the night, unaware of one another even though both ships have the same
owner, i.e. me :-)
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Chris Lee <updatelee@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/media/pci/cx88/cx88.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h index 3b0ae754f165..7748ca9abb09 100644 --- a/drivers/media/pci/cx88/cx88.h +++ b/drivers/media/pci/cx88/cx88.h @@ -485,6 +485,7 @@ struct cx8800_dev { /* pci i/o */ struct pci_dev *pci; unsigned char pci_rev,pci_lat; + void *alloc_ctx; const struct cx8800_fmt *fmt; @@ -548,6 +549,7 @@ struct cx8802_dev { /* pci i/o */ struct pci_dev *pci; unsigned char pci_rev,pci_lat; + void *alloc_ctx; /* dma queues */ struct cx88_dmaqueue mpegq; |