]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: light: gp2ap002: Fix rumtime PM imbalance on error
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Wed, 7 Apr 2021 03:49:27 +0000 (11:49 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 May 2021 08:29:51 +0000 (10:29 +0200)
[ Upstream commit 8edb79af88efc6e49e735f9baf61d9f0748b881f ]

When devm_request_threaded_irq() fails, we should decrease the
runtime PM counter to keep the counter balanced. But when
iio_device_register() fails, we need not to decrease it because
we have already decreased it before.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Fixes: 97d642e23037 ("iio: light: Add a driver for Sharp GP2AP002x00F")
Link: https://lore.kernel.org/r/20210407034927.16882-1-dinghao.liu@zju.edu.cn
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/iio/light/gp2ap002.c

index 7ba7aa59437c3d51f31707e98cd1af2922f983c1..040d8429a6e0002fa4970c10d865598b713378b3 100644 (file)
@@ -583,7 +583,7 @@ static int gp2ap002_probe(struct i2c_client *client,
                                        "gp2ap002", indio_dev);
        if (ret) {
                dev_err(dev, "unable to request IRQ\n");
-               goto out_disable_vio;
+               goto out_put_pm;
        }
        gp2ap002->irq = client->irq;
 
@@ -613,8 +613,9 @@ static int gp2ap002_probe(struct i2c_client *client,
 
        return 0;
 
-out_disable_pm:
+out_put_pm:
        pm_runtime_put_noidle(dev);
+out_disable_pm:
        pm_runtime_disable(dev);
 out_disable_vio:
        regulator_disable(gp2ap002->vio);