Commit c46f16f1 authored by Ondrej Jirman's avatar Ondrej Jirman Committed by Hans Verkuil

media: i2c: ov8858: Don't set fwnode in the driver

This makes the driver work with the new check in
v4l2_async_register_subdev() that was introduced recently in 6.6-rc1.
Without this change, probe fails with:

ov8858 1-0036: Detected OV8858 sensor, revision 0xb2
ov8858 1-0036: sub-device fwnode is an endpoint!
ov8858 1-0036: v4l2 async register subdev failed
ov8858: probe of 1-0036 failed with error -22

This also simplifies the driver a bit.
Signed-off-by: default avatarOndrej Jirman <megi@xff.cz>
Reviewed-by: default avatarJacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 1d4c2585
...@@ -1850,9 +1850,9 @@ static int ov8858_parse_of(struct ov8858 *ov8858) ...@@ -1850,9 +1850,9 @@ static int ov8858_parse_of(struct ov8858 *ov8858)
} }
ret = v4l2_fwnode_endpoint_parse(endpoint, &vep); ret = v4l2_fwnode_endpoint_parse(endpoint, &vep);
fwnode_handle_put(endpoint);
if (ret) { if (ret) {
dev_err(dev, "Failed to parse endpoint: %d\n", ret); dev_err(dev, "Failed to parse endpoint: %d\n", ret);
fwnode_handle_put(endpoint);
return ret; return ret;
} }
...@@ -1864,12 +1864,9 @@ static int ov8858_parse_of(struct ov8858 *ov8858) ...@@ -1864,12 +1864,9 @@ static int ov8858_parse_of(struct ov8858 *ov8858)
default: default:
dev_err(dev, "Unsupported number of data lanes %u\n", dev_err(dev, "Unsupported number of data lanes %u\n",
ov8858->num_lanes); ov8858->num_lanes);
fwnode_handle_put(endpoint);
return -EINVAL; return -EINVAL;
} }
ov8858->subdev.fwnode = endpoint;
return 0; return 0;
} }
...@@ -1913,7 +1910,7 @@ static int ov8858_probe(struct i2c_client *client) ...@@ -1913,7 +1910,7 @@ static int ov8858_probe(struct i2c_client *client)
ret = ov8858_init_ctrls(ov8858); ret = ov8858_init_ctrls(ov8858);
if (ret) if (ret)
goto err_put_fwnode; return ret;
sd = &ov8858->subdev; sd = &ov8858->subdev;
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS; sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
...@@ -1964,8 +1961,6 @@ static int ov8858_probe(struct i2c_client *client) ...@@ -1964,8 +1961,6 @@ static int ov8858_probe(struct i2c_client *client)
media_entity_cleanup(&sd->entity); media_entity_cleanup(&sd->entity);
err_free_handler: err_free_handler:
v4l2_ctrl_handler_free(&ov8858->ctrl_handler); v4l2_ctrl_handler_free(&ov8858->ctrl_handler);
err_put_fwnode:
fwnode_handle_put(ov8858->subdev.fwnode);
return ret; return ret;
} }
...@@ -1978,7 +1973,6 @@ static void ov8858_remove(struct i2c_client *client) ...@@ -1978,7 +1973,6 @@ static void ov8858_remove(struct i2c_client *client)
v4l2_async_unregister_subdev(sd); v4l2_async_unregister_subdev(sd);
media_entity_cleanup(&sd->entity); media_entity_cleanup(&sd->entity);
v4l2_ctrl_handler_free(&ov8858->ctrl_handler); v4l2_ctrl_handler_free(&ov8858->ctrl_handler);
fwnode_handle_put(ov8858->subdev.fwnode);
pm_runtime_disable(&client->dev); pm_runtime_disable(&client->dev);
if (!pm_runtime_status_suspended(&client->dev)) if (!pm_runtime_status_suspended(&client->dev))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment