diff options
| author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2014-03-24 20:33:17 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 18:19:15 +0200 |
| commit | 06e206721caf42935a458911fa4e5cdb49c22c0c (patch) | |
| tree | 0ca5fdbf754faf7dc7890a391a5360ce008450e7 /drivers/media/usb/em28xx/em28xx.h | |
| parent | [media] em28xx: move TV norm from struct em28xx to struct v4l2 (diff) | |
| download | linux-06e206721caf42935a458911fa4e5cdb49c22c0c.tar.xz linux-06e206721caf42935a458911fa4e5cdb49c22c0c.zip | |
[media] em28xx: move struct em28xx_fmt *format from struct em28xx to struct v4l2
The analog format struct belongs to analog TV. Move it out of the
common em28xx struct.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx.h')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index 5cf423449896..ef23803656bf 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h @@ -519,6 +519,7 @@ struct em28xx_v4l2 { u8 vinmode; u8 vinctl; + struct em28xx_fmt *format; v4l2_std_id norm; /* selected tv norm */ /* Frame properties */ @@ -607,8 +608,6 @@ struct em28xx { struct work_struct wq_trigger; /* Trigger to start/stop audio for alsa module */ atomic_t stream_started; /* stream should be running if true */ - struct em28xx_fmt *format; - /* Some older em28xx chips needs a waiting time after writing */ unsigned int wait_after_write; |