diff options
| author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2014-03-24 23:33:10 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 20:08:01 +0400 |
| commit | abc1308f0bb89d1e59d1eccb71f85161f8e80108 (patch) | |
| tree | 9f2751f3e27b3b38071d1c2855949e571e7789ee /drivers/media/usb/em28xx/em28xx.h | |
| parent | 95d2608b88a17d0a9326e91608f7b2cf4c1c000d (diff) | |
| download | linux-abc1308f0bb89d1e59d1eccb71f85161f8e80108.tar.xz | |
[media] em28xx: move struct v4l2_ctrl_handler ctrl_handler from struct em28xx to struct v4l2
Controls are only applicable to V4L2 module. Move the corresponding
data structs to the proper place.
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, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index 05deb84f70bb..24b2a9a73366 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h @@ -500,8 +500,10 @@ struct em28xx_eeprom { struct em28xx_v4l2 { struct kref ref; + struct em28xx *dev; struct v4l2_device v4l2_dev; + struct v4l2_ctrl_handler ctrl_handler; }; struct em28xx_audio { @@ -567,7 +569,6 @@ struct em28xx { unsigned int has_alsa_audio:1; unsigned int is_audio_only:1; - struct v4l2_ctrl_handler ctrl_handler; struct v4l2_clk *clk; struct em28xx_board board; |