summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Tretter <m.tretter@pengutronix.de>2016-12-19 15:19:59 +0100
committerMarco Felsch <m.felsch@pengutronix.de>2019-04-04 18:42:51 +0200
commit17b32435626ee4da474914ab9b9a6877fa16d9a9 (patch)
tree6ca334d6515df02207fe49dcd8acb628bdf5778b
parent21e25fa2871f0f79a52858260cfb80fdb7e163d5 (diff)
downloadlinux-0-day-17b32435626ee4da474914ab9b9a6877fa16d9a9.tar.gz
linux-0-day-17b32435626ee4da474914ab9b9a6877fa16d9a9.tar.xz
media: tvp5150: initialize subdev before parsing device tree
There are several debug prints in the tvp5150_parse_dt() function, which do not print the prefix, because the v4l2_subdev is not initialized, yet. Initialize the v4l2_subdev before parsing the device tree to fix the debug messages. Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
-rw-r--r--drivers/media/i2c/tvp5150.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index d126127628c5c..82a9cb9bf736e 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -1974,6 +1974,9 @@ static int tvp5150_probe(struct i2c_client *c,
core->regmap = map;
sd = &core->sd;
+ v4l2_i2c_subdev_init(sd, c, &tvp5150_ops);
+ sd->internal_ops = &tvp5150_internal_ops;
+ sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
if (IS_ENABLED(CONFIG_OF) && np) {
res = tvp5150_parse_dt(core, np);
@@ -1986,10 +1989,6 @@ static int tvp5150_probe(struct i2c_client *c,
core->mbus_type = V4L2_MBUS_BT656;
}
- v4l2_i2c_subdev_init(sd, c, &tvp5150_ops);
- sd->internal_ops = &tvp5150_internal_ops;
- sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-
res = tvp5150_mc_init(sd);
if (res)
goto err_cleanup_dt;