summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ideasonboard.com>2023-07-31 16:24:35 +0300
committerMauro Carvalho Chehab <mchehab@kernel.org>2023-08-10 07:58:37 +0200
commit905f88ccebb14e42bcd19455b0d9c0d4808f1897 (patch)
treeee07db2794d95ee9c5987ad96f373130fad677ae /drivers/media
parent59353d7051d67ffe8bb6da6152074961eeb3eb6e (diff)
media: i2c: ds90ub9x3: Fix sub-device matching
Commit 1029939b3782 ("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: 1029939b3782 ("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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/i2c/ds90ub913.c14
-rw-r--r--drivers/media/i2c/ds90ub953.c13
2 files changed, 2 insertions, 25 deletions
diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c
index 80d9cf6dd945..5410ccb54057 100644
--- a/drivers/media/i2c/ds90ub913.c
+++ b/drivers/media/i2c/ds90ub913.c
@@ -749,19 +749,9 @@ static int ub913_subdev_init(struct ub913_data *priv)
if (ret)
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);
if (ret)
- goto err_fwnode_put;
+ goto err_entity_cleanup;
ret = ub913_v4l2_notifier_register(priv);
if (ret) {
@@ -782,8 +772,6 @@ err_unreg_notif:
ub913_v4l2_nf_unregister(priv);
err_subdev_cleanup:
v4l2_subdev_cleanup(&priv->sd);
-err_fwnode_put:
- fwnode_handle_put(priv->sd.fwnode);
err_entity_cleanup:
media_entity_cleanup(&priv->sd.entity);
diff --git a/drivers/media/i2c/ds90ub953.c b/drivers/media/i2c/ds90ub953.c
index cadf75eb0773..20b9cf893f74 100644
--- a/drivers/media/i2c/ds90ub953.c
+++ b/drivers/media/i2c/ds90ub953.c
@@ -1221,18 +1221,9 @@ static int ub953_subdev_init(struct ub953_data *priv)
if (ret)
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);
if (ret)
- goto err_fwnode_put;
+ goto err_entity_cleanup;
ret = ub953_v4l2_notifier_register(priv);
if (ret) {
@@ -1253,8 +1244,6 @@ err_unreg_notif:
ub953_v4l2_notifier_unregister(priv);
err_free_state:
v4l2_subdev_cleanup(&priv->sd);
-err_fwnode_put:
- fwnode_handle_put(priv->sd.fwnode);
err_entity_cleanup:
media_entity_cleanup(&priv->sd.entity);