diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-03 13:10:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-13 21:10:14 -0200 |
| commit | 8cd61969c8a9b564435f4f903bddc09dfd39f944 (patch) | |
| tree | ffa6e758ec0e6c22fd32cc74241399edd6371121 /drivers/media/i2c/cx25840/cx25840-core.h | |
| parent | 00a5a4bf7bb40fe8cd5de042948b925c54b016de (diff) | |
| download | op-kernel-dev-8cd61969c8a9b564435f4f903bddc09dfd39f944.zip op-kernel-dev-8cd61969c8a9b564435f4f903bddc09dfd39f944.tar.gz | |
[media] cx25840: fill the media controller entity
Instead of keeping the media controller entity not initialized,
fill it and create the pads for cx25840.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/i2c/cx25840/cx25840-core.h')
| -rw-r--r-- | drivers/media/i2c/cx25840/cx25840-core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/i2c/cx25840/cx25840-core.h b/drivers/media/i2c/cx25840/cx25840-core.h index 37bc042..17b409f 100644 --- a/drivers/media/i2c/cx25840/cx25840-core.h +++ b/drivers/media/i2c/cx25840/cx25840-core.h @@ -64,6 +64,9 @@ struct cx25840_state { wait_queue_head_t fw_wait; /* wake up when the fw load is finished */ struct work_struct fw_work; /* work entry for fw load */ struct cx25840_ir_state *ir_state; +#if defined(CONFIG_MEDIA_CONTROLLER) + struct media_pad pads[3]; +#endif }; static inline struct cx25840_state *to_state(struct v4l2_subdev *sd) |
