aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorKyle Repinski <repinski23@gmail.com>2015-11-09 12:47:59 -0600
committerZiyan <jaraidaniel@gmail.com>2016-01-17 20:27:50 +0100
commitc01ae26d1cbc26d854ead4a6c9a3b29eb7cbd814 (patch)
tree47d198037fa7503e5b71a02b49bece535107dd22 /drivers/misc
parent4902714e35cbd9be48372b8e74ef8f1275f300b2 (diff)
downloadkernel_samsung_tuna-c01ae26d1cbc26d854ead4a6c9a3b29eb7cbd814.zip
kernel_samsung_tuna-c01ae26d1cbc26d854ead4a6c9a3b29eb7cbd814.tar.gz
kernel_samsung_tuna-c01ae26d1cbc26d854ead4a6c9a3b29eb7cbd814.tar.bz2
misc: inv_mpu: include time spent in suspend for irqtime
Android is (now?) expecting input event timestamps to do this. Resolves screen rotation issue after suspend in Marshmallow. Signed-off-by: Kyle Repinski <repinski23@gmail.com>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/inv_mpu/mpu-dev.c2
-rw-r--r--drivers/misc/inv_mpu/mpuirq.c2
-rw-r--r--drivers/misc/inv_mpu/slaveirq.c2
-rw-r--r--drivers/misc/inv_mpu/timerirq.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/inv_mpu/mpu-dev.c b/drivers/misc/inv_mpu/mpu-dev.c
index 26622b8..e976d12 100644
--- a/drivers/misc/inv_mpu/mpu-dev.c
+++ b/drivers/misc/inv_mpu/mpu-dev.c
@@ -100,7 +100,7 @@ static int mpu_pm_notifier_callback(struct notifier_block *nb,
if (event == PM_POST_SUSPEND)
mpu->event = MPU_PM_EVENT_POST_SUSPEND;
- mpu->mpu_pm_event.irqtime = ktime_to_ns(ktime_get());
+ mpu->mpu_pm_event.irqtime = ktime_to_ns(ktime_get_boottime());
mpu->mpu_pm_event.interruptcount++;
mpu->mpu_pm_event.data_type = MPUIRQ_DATA_TYPE_PM_EVENT;
mpu->mpu_pm_event.data = mpu->event;
diff --git a/drivers/misc/inv_mpu/mpuirq.c b/drivers/misc/inv_mpu/mpuirq.c
index 094712c..f262441 100644
--- a/drivers/misc/inv_mpu/mpuirq.c
+++ b/drivers/misc/inv_mpu/mpuirq.c
@@ -163,7 +163,7 @@ static irqreturn_t mpuirq_handler(int irq, void *dev_id)
/* and ignore first interrupt generated in module init */
mpuirq_dev_data.data_ready = 1;
- mpuirq_data.irqtime = ktime_to_ns(ktime_get());
+ mpuirq_data.irqtime = ktime_to_ns(ktime_get_boottime());
mpuirq_data.data_type = MPUIRQ_DATA_TYPE_MPU_IRQ;
mpuirq_data.data = 0;
diff --git a/drivers/misc/inv_mpu/slaveirq.c b/drivers/misc/inv_mpu/slaveirq.c
index efbaeb8..958bedd 100644
--- a/drivers/misc/inv_mpu/slaveirq.c
+++ b/drivers/misc/inv_mpu/slaveirq.c
@@ -169,7 +169,7 @@ static irqreturn_t slaveirq_handler(int irq, void *dev_id)
/* wake up (unblock) for reading data from userspace */
data->data_ready = 1;
- data->data.irqtime = ktime_to_ns(ktime_get());
+ data->data.irqtime = ktime_to_ns(ktime_get_boottime());
data->data.data_type |= 1;
wake_up_interruptible(&data->slaveirq_wait);
diff --git a/drivers/misc/inv_mpu/timerirq.c b/drivers/misc/inv_mpu/timerirq.c
index 495a808..38e23fe 100644
--- a/drivers/misc/inv_mpu/timerirq.c
+++ b/drivers/misc/inv_mpu/timerirq.c
@@ -66,7 +66,7 @@ static void timerirq_handler(unsigned long arg)
data->data_ready = 1;
- data->data.irqtime = ktime_to_ns(ktime_get());
+ data->data.irqtime = ktime_to_ns(ktime_get_boottime());
data->data.data_type |= 1;
dev_dbg(data->dev->this_device,