lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 117/178] sata_rcar: handle pm_runtime_get_sync failure cases
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    [ Upstream commit eea1238867205b9e48a67c1a63219529a73c46fd ]

    Calling pm_runtime_get_sync increments the counter even in case of
    failure, causing incorrect ref count. Call pm_runtime_put if
    pm_runtime_get_sync fails.

    Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/ata/sata_rcar.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
    index 3495e1733a8e6..c35b7b993133e 100644
    --- a/drivers/ata/sata_rcar.c
    +++ b/drivers/ata/sata_rcar.c
    @@ -905,7 +905,7 @@ static int sata_rcar_probe(struct platform_device *pdev)
    pm_runtime_enable(dev);
    ret = pm_runtime_get_sync(dev);
    if (ret < 0)
    - goto err_pm_disable;
    + goto err_pm_put;

    host = ata_host_alloc(dev, 1);
    if (!host) {
    @@ -935,7 +935,6 @@ static int sata_rcar_probe(struct platform_device *pdev)

    err_pm_put:
    pm_runtime_put(dev);
    -err_pm_disable:
    pm_runtime_disable(dev);
    return ret;
    }
    @@ -989,8 +988,10 @@ static int sata_rcar_resume(struct device *dev)
    int ret;

    ret = pm_runtime_get_sync(dev);
    - if (ret < 0)
    + if (ret < 0) {
    + pm_runtime_put(dev);
    return ret;
    + }

    if (priv->type == RCAR_GEN3_SATA) {
    sata_rcar_init_module(priv);
    @@ -1015,8 +1016,10 @@ static int sata_rcar_restore(struct device *dev)
    int ret;

    ret = pm_runtime_get_sync(dev);
    - if (ret < 0)
    + if (ret < 0) {
    + pm_runtime_put(dev);
    return ret;
    + }

    sata_rcar_setup_port(host);

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 21:53    [W:4.034 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site