admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: i2c: ds90ub9x3: Fix sub-device matching

Browse Source 
Commit 1029939b37 ("media: v4l: async: Simplify async sub-device fwnode
matching") recently changed how async sub-device matching works. This
breaks the UB9x3 drivers, as they set the subdev.fwnode to an endpoint.
Afaiu, the fix is simply to not set subdev.fwnode at all.

Fixes: 1029939b37 ("media: v4l: async: Simplify async sub-device fwnode matching")
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Tomi Valkeinen
2023-07-31 16:24:35 +03:00
committed by Mauro Carvalho Chehab
parent 59353d7051
commit 905f88cceb
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/i2c/ds90ub913.c
View File

@@ -749,19 +749,9 @@ static int ub913_subdev_init(struct ub913_data *priv)
if (ret) if (ret)
return dev_err_probe(dev, ret, "Failed to init pads\n"); return dev_err_probe(dev, ret, "Failed to init pads\n");
priv->sd.fwnode = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev),
UB913_PAD_SOURCE, 0,
0);
if (!priv->sd.fwnode) {
ret = -ENODEV;
dev_err_probe(dev, ret, "Missing TX endpoint\n");
goto err_entity_cleanup;
}
ret = v4l2_subdev_init_finalize(&priv->sd); ret = v4l2_subdev_init_finalize(&priv->sd);
if (ret) if (ret)
goto err_fwnode_put; goto err_entity_cleanup;
ret = ub913_v4l2_notifier_register(priv); ret = ub913_v4l2_notifier_register(priv);
if (ret) { if (ret) {
@@ -782,8 +772,6 @@ err_unreg_notif:
ub913_v4l2_nf_unregister(priv); ub913_v4l2_nf_unregister(priv);
err_subdev_cleanup: err_subdev_cleanup:
v4l2_subdev_cleanup(&priv->sd); v4l2_subdev_cleanup(&priv->sd);
err_fwnode_put:
fwnode_handle_put(priv->sd.fwnode);
err_entity_cleanup: err_entity_cleanup:
media_entity_cleanup(&priv->sd.entity); media_entity_cleanup(&priv->sd.entity);

13
drivers/media/i2c/ds90ub953.c
View File

@@ -1221,18 +1221,9 @@ static int ub953_subdev_init(struct ub953_data *priv)
if (ret) if (ret)
return dev_err_probe(dev, ret, "Failed to init pads\n"); return dev_err_probe(dev, ret, "Failed to init pads\n");
priv->sd.fwnode = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev),
UB953_PAD_SOURCE, 0,
0);
if (!priv->sd.fwnode) {
ret = -ENODEV;
dev_err_probe(dev, ret, "Missing TX endpoint\n");
goto err_entity_cleanup;
}
ret = v4l2_subdev_init_finalize(&priv->sd); ret = v4l2_subdev_init_finalize(&priv->sd);
if (ret) if (ret)
goto err_fwnode_put; goto err_entity_cleanup;
ret = ub953_v4l2_notifier_register(priv); ret = ub953_v4l2_notifier_register(priv);
if (ret) { if (ret) {
@@ -1253,8 +1244,6 @@ err_unreg_notif:
ub953_v4l2_notifier_unregister(priv); ub953_v4l2_notifier_unregister(priv);
err_free_state: err_free_state:
v4l2_subdev_cleanup(&priv->sd); v4l2_subdev_cleanup(&priv->sd);
err_fwnode_put:
fwnode_handle_put(priv->sd.fwnode);
err_entity_cleanup: err_entity_cleanup:
media_entity_cleanup(&priv->sd.entity); media_entity_cleanup(&priv->sd.entity);