lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 092/606] i2c: fix missing pm_runtime_put_sync in i2c_device_probe
    Date
    From: Alain Volmat <alain.volmat@st.com>

    [ Upstream commit 3c3dd56f760da056e821ac177e3ad0de4209a435 ]

    In case of the I2C client exposes the flag I2C_CLIENT_HOST_NOTIFY,
    pm_runtime_get_sync is called in order to always keep active the
    adapter. However later on, pm_runtime_put_sync is never called
    within the function in case of an error. This commit add this
    error handling.

    Fixes: 72bfcee11cf8 ("i2c: Prevent runtime suspend of adapter when Host Notify is required")
    Signed-off-by: Alain Volmat <alain.volmat@st.com>
    Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
    Signed-off-by: Wolfram Sang <wsa@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/i2c/i2c-core-base.c | 22 ++++++++++++++++------
    1 file changed, 16 insertions(+), 6 deletions(-)

    diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
    index cefad0881942..fd3199782b6e 100644
    --- a/drivers/i2c/i2c-core-base.c
    +++ b/drivers/i2c/i2c-core-base.c
    @@ -338,8 +338,10 @@ static int i2c_device_probe(struct device *dev)
    } else if (ACPI_COMPANION(dev)) {
    irq = i2c_acpi_get_irq(client);
    }
    - if (irq == -EPROBE_DEFER)
    - return irq;
    + if (irq == -EPROBE_DEFER) {
    + status = irq;
    + goto put_sync_adapter;
    + }

    if (irq < 0)
    irq = 0;
    @@ -353,15 +355,19 @@ static int i2c_device_probe(struct device *dev)
    */
    if (!driver->id_table &&
    !i2c_acpi_match_device(dev->driver->acpi_match_table, client) &&
    - !i2c_of_match_device(dev->driver->of_match_table, client))
    - return -ENODEV;
    + !i2c_of_match_device(dev->driver->of_match_table, client)) {
    + status = -ENODEV;
    + goto put_sync_adapter;
    + }

    if (client->flags & I2C_CLIENT_WAKE) {
    int wakeirq;

    wakeirq = of_irq_get_byname(dev->of_node, "wakeup");
    - if (wakeirq == -EPROBE_DEFER)
    - return wakeirq;
    + if (wakeirq == -EPROBE_DEFER) {
    + status = wakeirq;
    + goto put_sync_adapter;
    + }

    device_init_wakeup(&client->dev, true);

    @@ -408,6 +414,10 @@ static int i2c_device_probe(struct device *dev)
    err_clear_wakeup_irq:
    dev_pm_clear_wake_irq(&client->dev);
    device_init_wakeup(&client->dev, false);
    +put_sync_adapter:
    + if (client->flags & I2C_CLIENT_HOST_NOTIFY)
    + pm_runtime_put_sync(&client->adapter->dev);
    +
    return status;
    }

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 01:18    [W:4.104 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site