lkml.org 
[lkml]   [2019]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.2 148/249] media: mt9m111: fix fw-node refactoring
    Date
    From: Robert Jarzmik <robert.jarzmik@free.fr>

    [ 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>
    ---
    drivers/media/i2c/mt9m111.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
    index 362c3b93636e..5a642b5ad076 100644
    --- a/drivers/media/i2c/mt9m111.c
    +++ b/drivers/media/i2c/mt9m111.c
    @@ -1245,9 +1245,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))
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-15 16:15    [W:4.080 / U:0.568 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site