lkml.org 
[lkml]   [2015]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 45/96] i2c: rcar: enable RuntimePM before registering to the core
    Date
    3.13.11-ckt30 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Wolfram Sang <wsa+renesas@sang-engineering.com>

    commit 4f7effddf4549d57114289f273710f077c4c330a upstream.

    The core may register clients attached to this master which may use
    funtionality from the master. So, RuntimePM must be enabled before, otherwise
    this will fail. While here, move drvdata, too.

    Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
    Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/i2c/busses/i2c-rcar.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
    index e64bb5b..4bc5929 100644
    --- a/drivers/i2c/busses/i2c-rcar.c
    +++ b/drivers/i2c/busses/i2c-rcar.c
    @@ -712,15 +712,16 @@ static int rcar_i2c_probe(struct platform_device *pdev)
    return ret;
    }

    + pm_runtime_enable(dev);
    + platform_set_drvdata(pdev, priv);
    +
    ret = i2c_add_numbered_adapter(adap);
    if (ret < 0) {
    dev_err(dev, "reg adap failed: %d\n", ret);
    + pm_runtime_disable(dev);
    return ret;
    }

    - pm_runtime_enable(dev);
    - platform_set_drvdata(pdev, priv);
    -
    dev_info(dev, "probed\n");

    return 0;
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-11-13 23:21    [W:4.221 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site