media: mt9m111: fix fw-node refactoring

[ Upstream commit 8d4e29a51a954b43e06d916772fa4f50b7e5bbd6 ]

In the patch refactoring the fw-node, the mt9m111 was broken for all
platform_data based platforms, which were the first aim of this
driver. Only the devicetree platform are still functional, probably
because the testing was done on these.

The result is that -EINVAL is systematically return for such platforms,
what this patch fixes.

[Sakari Ailus: Rework this to resolve a merge conflict and use dev_fwnode]

Fixes: 98480d65c48c ("media: mt9m111: allow to setup pixclk polarity")
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
index 5168bb5880c47a16f6965b516eede511e237e63f..3a543e435e61b3b9bcf0b9b21a88d75e5beeebb4 100644 (file)
--- a/drivers/media/i2c/mt9m111.c
+++ b/drivers/media/i2c/mt9m111.c
@@ -1248,9 +1248,11 @@ static int mt9m111_probe(struct i2c_client *client,
        if (!mt9m111)
                return -ENOMEM;
 
-       ret = mt9m111_probe_fw(client, mt9m111);
-       if (ret)
-               return ret;
+       if (dev_fwnode(&client->dev)) {
+               ret = mt9m111_probe_fw(client, mt9m111);
+               if (ret)
+                       return ret;
+       }
 
        mt9m111->clk = v4l2_clk_get(&client->dev, "mclk");
        if (IS_ERR(mt9m111->clk))