|
@@ -861,8 +861,6 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd,
|
|
|
|
|
|
f = &format->format;
|
|
f = &format->format;
|
|
|
|
|
|
- tvp5150_reset(sd, 0);
|
|
|
|
-
|
|
|
|
f->width = decoder->rect.width;
|
|
f->width = decoder->rect.width;
|
|
f->height = decoder->rect.height / 2;
|
|
f->height = decoder->rect.height / 2;
|
|
|
|
|
|
@@ -1524,7 +1522,6 @@ static int tvp5150_probe(struct i2c_client *c,
|
|
res = core->hdl.error;
|
|
res = core->hdl.error;
|
|
goto err;
|
|
goto err;
|
|
}
|
|
}
|
|
- v4l2_ctrl_handler_setup(&core->hdl);
|
|
|
|
|
|
|
|
/* Default is no cropping */
|
|
/* Default is no cropping */
|
|
core->rect.top = 0;
|
|
core->rect.top = 0;
|
|
@@ -1535,6 +1532,8 @@ static int tvp5150_probe(struct i2c_client *c,
|
|
core->rect.left = 0;
|
|
core->rect.left = 0;
|
|
core->rect.width = TVP5150_H_MAX;
|
|
core->rect.width = TVP5150_H_MAX;
|
|
|
|
|
|
|
|
+ tvp5150_reset(sd, 0); /* Calls v4l2_ctrl_handler_setup() */
|
|
|
|
+
|
|
res = v4l2_async_register_subdev(sd);
|
|
res = v4l2_async_register_subdev(sd);
|
|
if (res < 0)
|
|
if (res < 0)
|
|
goto err;
|
|
goto err;
|