summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-31 09:03:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-31 09:03:10 +0200
commit2d06954e23375a8d299131eddede3a1720bf8539 (patch)
tree97fd2961e7ef0b2a948824c035682719e232ab10 /drivers/misc/mei
parentd99247f9b542533ddbf87a3481a05473b8e48194 (diff)
parent8124c8a6b35386f73523d27eacb71b5364a68c4c (diff)
downloadlinux-2d06954e23375a8d299131eddede3a1720bf8539.tar.gz
linux-2d06954e23375a8d299131eddede3a1720bf8539.tar.bz2
linux-2d06954e23375a8d299131eddede3a1720bf8539.zip
Merge 5.13-rc4 into char-misc-next
We need the char/misc fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei')
-rw-r--r--drivers/misc/mei/interrupt.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index a98f6b895af7..aab3ebfa9fc4 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -277,6 +277,9 @@ static int mei_cl_irq_read(struct mei_cl *cl, struct mei_cl_cb *cb,
return ret;
}
+ pm_runtime_mark_last_busy(dev->dev);
+ pm_request_autosuspend(dev->dev);
+
list_move_tail(&cb->list, &cl->rd_pending);
return 0;