diff options
author | Martin Bugge <marbugge@cisco.com> | 2013-12-05 09:39:37 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-01-07 03:22:26 -0500 |
commit | 7de5be44a523558b7b5330fba9d24e95a519c1ec (patch) | |
tree | ea09ad75972a20542e90e4949b2d198dd1c7179b | |
parent | c9f1f271d4b6455d5ecf43e393668a7c8f4cb833 (diff) |
[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>
-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"); | |||
61 | */ | 61 | */ |
62 | 62 | ||
63 | struct adv7842_state { | 63 | struct adv7842_state { |
64 | struct adv7842_platform_data pdata; | ||
64 | struct v4l2_subdev sd; | 65 | struct v4l2_subdev sd; |
65 | struct media_pad pad; | 66 | struct media_pad pad; |
66 | struct v4l2_ctrl_handler hdl; | 67 | struct v4l2_ctrl_handler hdl; |
@@ -2730,6 +2731,9 @@ static int adv7842_probe(struct i2c_client *client, | |||
2730 | return -ENOMEM; | 2731 | return -ENOMEM; |
2731 | } | 2732 | } |
2732 | 2733 | ||
2734 | /* platform data */ | ||
2735 | state->pdata = *pdata; | ||
2736 | |||
2733 | sd = &state->sd; | 2737 | sd = &state->sd; |
2734 | v4l2_i2c_subdev_init(sd, client, &adv7842_ops); | 2738 | v4l2_i2c_subdev_init(sd, client, &adv7842_ops); |
2735 | sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; | 2739 | sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; |
@@ -2834,7 +2838,7 @@ static int adv7842_probe(struct i2c_client *client, | |||
2834 | if (err) | 2838 | if (err) |
2835 | goto err_work_queues; | 2839 | goto err_work_queues; |
2836 | 2840 | ||
2837 | err = adv7842_core_init(sd, pdata); | 2841 | err = adv7842_core_init(sd); |
2838 | if (err) | 2842 | if (err) |
2839 | goto err_entity; | 2843 | goto err_entity; |
2840 | 2844 | ||