From: Greg Kroah-Hartman Date: Mon, 31 Oct 2022 05:51:02 +0000 (+0100) Subject: drop queue-5.15/usb-typec-ucsi-acpi-implement-resume-callback.patch X-Git-Tag: v4.19.263~74 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f18cf6b73e4b14c1aa32eacb9ba44a4a3377cb5;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.15/usb-typec-ucsi-acpi-implement-resume-callback.patch --- diff --git a/queue-5.15/series b/queue-5.15/series index 0ea3c5aa127..d977ce9fe86 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -12,7 +12,6 @@ usb-gadget-uvc-fix-sg-handling-in-error-case.patch usb-gadget-uvc-fix-sg-handling-during-video-encode.patch usb-dwc3-gadget-stop-processing-more-requests-on-imi.patch usb-dwc3-gadget-don-t-set-imi-for-no_interrupt.patch -usb-typec-ucsi-acpi-implement-resume-callback.patch usb-bdc-change-state-when-port-disconnected.patch usb-xhci-add-xhci_spurious_success-to-asm1042-despite-being-a-v0.96-controller.patch mtd-rawnand-marvell-use-correct-logic-for-nand-keep-config.patch diff --git a/queue-5.15/usb-typec-ucsi-acpi-implement-resume-callback.patch b/queue-5.15/usb-typec-ucsi-acpi-implement-resume-callback.patch deleted file mode 100644 index 48d45bd90ff..00000000000 --- a/queue-5.15/usb-typec-ucsi-acpi-implement-resume-callback.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4e3a50293c2b21961f02e1afa2f17d3a1a90c7c8 Mon Sep 17 00:00:00 2001 -From: Heikki Krogerus -Date: Fri, 7 Oct 2022 13:09:51 +0300 -Subject: usb: typec: ucsi: acpi: Implement resume callback - -From: Heikki Krogerus - -commit 4e3a50293c2b21961f02e1afa2f17d3a1a90c7c8 upstream. - -The ACPI driver needs to resume the interface by calling -ucsi_resume(). Otherwise we may fail to detect connections -and disconnections that happen while the system is -suspended. - -Link: https://bugzilla.kernel.org/show_bug.cgi?id=210425 -Fixes: a94ecde41f7e ("usb: typec: ucsi: ccg: enable runtime pm support") -Cc: -Signed-off-by: Heikki Krogerus -Link: https://lore.kernel.org/r/20221007100951.43798-3-heikki.krogerus@linux.intel.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/typec/ucsi/ucsi_acpi.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/usb/typec/ucsi/ucsi_acpi.c -+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c -@@ -196,6 +196,15 @@ static int ucsi_acpi_remove(struct platf - return 0; - } - -+static int ucsi_acpi_resume(struct device *dev) -+{ -+ struct ucsi_acpi *ua = dev_get_drvdata(dev); -+ -+ return ucsi_resume(ua->ucsi); -+} -+ -+static DEFINE_SIMPLE_DEV_PM_OPS(ucsi_acpi_pm_ops, NULL, ucsi_acpi_resume); -+ - static const struct acpi_device_id ucsi_acpi_match[] = { - { "PNP0CA0", 0 }, - { }, -@@ -205,6 +214,7 @@ MODULE_DEVICE_TABLE(acpi, ucsi_acpi_matc - static struct platform_driver ucsi_acpi_platform_driver = { - .driver = { - .name = "ucsi_acpi", -+ .pm = pm_ptr(&ucsi_acpi_pm_ops), - .acpi_match_table = ACPI_PTR(ucsi_acpi_match), - }, - .probe = ucsi_acpi_probe,