aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/i2c/adv7604.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index be9699e28738..71c8570bd9ea 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -2207,6 +2207,8 @@ static struct i2c_client *adv7604_dummy_client(struct v4l2_subdev *sd,
2207static int adv7604_probe(struct i2c_client *client, 2207static int adv7604_probe(struct i2c_client *client,
2208 const struct i2c_device_id *id) 2208 const struct i2c_device_id *id)
2209{ 2209{
2210 static const struct v4l2_dv_timings cea640x480 =
2211 V4L2_DV_BT_CEA_640X480P59_94;
2210 struct adv7604_state *state; 2212 struct adv7604_state *state;
2211 struct adv7604_platform_data *pdata = client->dev.platform_data; 2213 struct adv7604_platform_data *pdata = client->dev.platform_data;
2212 struct v4l2_ctrl_handler *hdl; 2214 struct v4l2_ctrl_handler *hdl;
@@ -2234,7 +2236,8 @@ static int adv7604_probe(struct i2c_client *client,
2234 v4l_err(client, "No platform data!\n"); 2236 v4l_err(client, "No platform data!\n");
2235 return -ENODEV; 2237 return -ENODEV;
2236 } 2238 }
2237 memcpy(&state->pdata, pdata, sizeof(state->pdata)); 2239 state->pdata = *pdata;
2240 state->timings = cea640x480;
2238 2241
2239 sd = &state->sd; 2242 sd = &state->sd;
2240 v4l2_i2c_subdev_init(sd, client, &adv7604_ops); 2243 v4l2_i2c_subdev_init(sd, client, &adv7604_ops);