]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
iio: light: rpr0521 poweroff for probe fails
authorMikko Koivunen <mikko.koivunen@fi.rohmeurope.com>
Thu, 18 May 2017 12:12:50 +0000 (15:12 +0300)
committerJonathan Cameron <jic23@kernel.org>
Sun, 21 May 2017 14:06:11 +0000 (15:06 +0100)
Set sensor measurement off after probe fail in pm_runtime_set_active() or
iio_device_register(). Without this change sensor measurement stays on
even though probe fails on these calls.

This is maybe rare case, but causes constant power drain without any
benefits when it happens. Power drain is 20-500uA, typically 180uA.

Signed-off-by: Mikko Koivunen <mikko.koivunen@fi.rohmeurope.com>
Acked-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/light/rpr0521.c

index 03504f6ecd3b0639338ae69d76fcef9400723497..84d8d403e547776cda5c9b908703767e11039fb6 100644 (file)
@@ -516,13 +516,26 @@ static int rpr0521_probe(struct i2c_client *client,
 
        ret = pm_runtime_set_active(&client->dev);
        if (ret < 0)
-               return ret;
+               goto err_poweroff;
 
        pm_runtime_enable(&client->dev);
        pm_runtime_set_autosuspend_delay(&client->dev, RPR0521_SLEEP_DELAY_MS);
        pm_runtime_use_autosuspend(&client->dev);
 
-       return iio_device_register(indio_dev);
+       ret = iio_device_register(indio_dev);
+       if (ret)
+               goto err_pm_disable;
+
+       return 0;
+
+err_pm_disable:
+       pm_runtime_disable(&client->dev);
+       pm_runtime_set_suspended(&client->dev);
+       pm_runtime_put_noidle(&client->dev);
+err_poweroff:
+       rpr0521_poweroff(data);
+
+       return ret;
 }
 
 static int rpr0521_remove(struct i2c_client *client)