diff options
| author | Martin Bugge <marbugge@cisco.com> | 2013-12-05 18:39:37 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-01-07 12:22:26 +0400 |
| commit | 7de5be44a523558b7b5330fba9d24e95a519c1ec (patch) | |
| tree | ea09ad75972a20542e90e4949b2d198dd1c7179b /drivers/media/i2c | |
| parent | c9f1f271d4b6455d5ecf43e393668a7c8f4cb833 (diff) | |
| download | linux-7de5be44a523558b7b5330fba9d24e95a519c1ec.tar.xz | |
[media] adv7842: save platform data in state struct
Signed-off-by: Martin Bugge <marbugge@cisco.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/i2c')
| -rw-r--r-- | drivers/media/i2c/adv7842.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index cbbfa774079d..4f93526e3b64 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c @@ -61,6 +61,7 @@ MODULE_LICENSE("GPL"); */ struct adv7842_state { + struct adv7842_platform_data pdata; struct v4l2_subdev sd; struct media_pad pad; struct v4l2_ctrl_handler hdl; @@ -2730,6 +2731,9 @@ static int adv7842_probe(struct i2c_client *client, return -ENOMEM; } + /* platform data */ + state->pdata = *pdata; + sd = &state->sd; v4l2_i2c_subdev_init(sd, client, &adv7842_ops); sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; @@ -2834,7 +2838,7 @@ static int adv7842_probe(struct i2c_client *client, if (err) goto err_work_queues; - err = adv7842_core_init(sd, pdata); + err = adv7842_core_init(sd); if (err) goto err_entity; |