f52dae4ec1
Revert a3a3ed3: "updating 4.19 patches to fix touch and suspend".
Calling intel_ipts_cleanup during suspend causes destroy_doorbell to
fail. Furthermore, removing intel_ipts_cleanup from suspend does not
seem to cause any issues on the Surface Book 1 and 2, and the
introduction of the device link in the previous commit may have fixed
some of the edge-cases/race conditions that may have made this call
necessary in the past. If any issue arises from this, we will deal with
it later in a more subtle way.
See https://github.com/jakeday/linux-surface/issues/544 for an
exhaustive discussion on this.
27 lines
768 B
Diff
27 lines
768 B
Diff
From 6a4d910235d90084741830edfbb83b6cb0a24aa4 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Fri, 26 Jul 2019 04:45:55 +0200
|
|
Subject: [PATCH 07/12] sdcard-reader
|
|
|
|
---
|
|
drivers/usb/core/hub.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
|
index 2f94568ba385..b90ed9c06449 100644
|
|
--- a/drivers/usb/core/hub.c
|
|
+++ b/drivers/usb/core/hub.c
|
|
@@ -4201,7 +4201,8 @@ void usb_enable_lpm(struct usb_device *udev)
|
|
if (!udev || !udev->parent ||
|
|
udev->speed < USB_SPEED_SUPER ||
|
|
!udev->lpm_capable ||
|
|
- udev->state < USB_STATE_DEFAULT)
|
|
+ udev->state < USB_STATE_DEFAULT ||
|
|
+ !udev->bos || !udev->bos->ss_cap)
|
|
return;
|
|
|
|
udev->lpm_disable_count--;
|
|
--
|
|
2.23.0
|
|
|