aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorIrina Tirdea <irina.tirdea@intel.com>2014-12-05 17:18:07 -0500
committerJonathan Cameron <jic23@kernel.org>2014-12-12 07:28:26 -0500
commitd3653d09891b57f2e8089b8908f24a2e97576a49 (patch)
treebc30bdb7d0ecacb3d51a323ac7bf097f7430e67c /drivers/iio
parent3a2ecc3d2dce6e051b6afc319bb380c829e4e4fd (diff)
iio: accel: kxcjk-1013: always power on device in resume
When the system resumes, it will first call system resume and then runtime suspend (if CONFIG_RUNTIME_PM is enabled). There is no need to conditionally power on the device in system resume, so always power it on and leave runtime suspend to power it off if needed. Suggested-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Irina Tirdea <irina.tirdea@intel.com> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/accel/kxcjk-1013.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index 1720e9a547ff..aed377797ded 100644
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -1354,10 +1354,7 @@ static int kxcjk1013_resume(struct device *dev)
1354 int ret = 0; 1354 int ret = 0;
1355 1355
1356 mutex_lock(&data->mutex); 1356 mutex_lock(&data->mutex);
1357 /* Check, if the suspend occured while active */ 1357 ret = kxcjk1013_set_mode(data, OPERATION);
1358 if (data->dready_trigger_on || data->motion_trigger_on ||
1359 data->ev_enable_state)
1360 ret = kxcjk1013_set_mode(data, OPERATION);
1361 mutex_unlock(&data->mutex); 1358 mutex_unlock(&data->mutex);
1362 1359
1363 return ret; 1360 return ret;