diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-04-13 10:00:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-16 18:06:35 -0300 |
| commit | 2efe2cc4305ad9a8ea4db5881808c4db1c451091 (patch) | |
| tree | 66b3337700b6c114568a590cdb8cb6e40b8235bf /drivers/media/pci/cx25821/cx25821.h | |
| parent | 11f095aa4154d27bdb15909b12a9d3922ab55cde (diff) | |
[media] cx25821: move vidq from cx25821_fh to cx25821_channel
This is not a per-filehandle object, it's a per-channel object.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/cx25821/cx25821.h')
| -rw-r--r-- | drivers/media/pci/cx25821/cx25821.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h index d1c91c9e911..06dadb5d9e5 100644 --- a/drivers/media/pci/cx25821/cx25821.h +++ b/drivers/media/pci/cx25821/cx25821.h @@ -123,10 +123,7 @@ struct cx25821_fh { enum v4l2_priority prio; /* video capture */ - const struct cx25821_fmt *fmt; - unsigned int width, height; int channel_id; - struct videobuf_queue vidq; }; enum cx25821_itype { @@ -217,12 +214,15 @@ struct cx25821_channel { struct cx25821_data timeout_data; struct video_device vdev; - struct cx25821_dmaqueue vidq; + struct cx25821_dmaqueue dma_vidq; + struct videobuf_queue vidq; const struct sram_channel *sram_channels; int resources; + const struct cx25821_fmt *fmt; + unsigned int width, height; int pixel_formats; int use_cif_resolution; int cif_width; |