浏览代码

iio: light: rpr0521 poweroff for probe fails

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>
Mikko Koivunen 8 年之前
父节点
当前提交
12d7494913
共有 1 个文件被更改,包括 15 次插入2 次删除
  1. 15 2
      drivers/iio/light/rpr0521.c

+ 15 - 2
drivers/iio/light/rpr0521.c

@@ -516,13 +516,26 @@ static int rpr0521_probe(struct i2c_client *client,
 
 
 	ret = pm_runtime_set_active(&client->dev);
 	ret = pm_runtime_set_active(&client->dev);
 	if (ret < 0)
 	if (ret < 0)
-		return ret;
+		goto err_poweroff;
 
 
 	pm_runtime_enable(&client->dev);
 	pm_runtime_enable(&client->dev);
 	pm_runtime_set_autosuspend_delay(&client->dev, RPR0521_SLEEP_DELAY_MS);
 	pm_runtime_set_autosuspend_delay(&client->dev, RPR0521_SLEEP_DELAY_MS);
 	pm_runtime_use_autosuspend(&client->dev);
 	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)
 static int rpr0521_remove(struct i2c_client *client)