diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-05-31 08:30:49 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 10:08:53 -0300 |
| commit | 813b9dffa0cfefdd71b262e1ec4ad5f7d1fb8f89 (patch) | |
| tree | 718f9a5dbff62635dd5bbf569be9e31cd7923c58 /drivers/media/pci/saa7134/saa7134.h | |
| parent | b12262f9472d714341d9d83f47cccd76c977aa0e (diff) | |
| download | blackbird-op-linux-813b9dffa0cfefdd71b262e1ec4ad5f7d1fb8f89.tar.gz blackbird-op-linux-813b9dffa0cfefdd71b262e1ec4ad5f7d1fb8f89.zip | |
[media] saa7134: move fmt/width/height from saa7134_fh to saa7134_dev
These fields are global, not per-filehandle.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134.h')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h index fa21d14ea16e..8a62ff733343 100644 --- a/drivers/media/pci/saa7134/saa7134.h +++ b/drivers/media/pci/saa7134/saa7134.h @@ -475,8 +475,6 @@ struct saa7134_fh { struct pm_qos_request qos_request; /* video capture */ - struct saa7134_format *fmt; - unsigned int width,height; struct videobuf_queue cap; struct saa7134_pgtable pt_cap; @@ -595,6 +593,8 @@ struct saa7134_dev { struct saa7134_dmaqueue vbi_q; unsigned int video_fieldcount; unsigned int vbi_fieldcount; + struct saa7134_format *fmt; + unsigned int width, height; /* various v4l controls */ struct saa7134_tvnorm *tvnorm; /* video */ |
