diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-10-03 09:32:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-10-03 09:32:25 +0200 |
| commit | de80193308f43d3ae52cd3561e8ba77cd1437311 (patch) | |
| tree | 3960ff42c407370dfd8c114e5b828bdece9cf425 /drivers/usb/cdns3/cdns3-plat.c | |
| parent | 54aee5f15b83437f23b2b2469bcf21bdd9823916 (diff) | |
| parent | 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa (diff) | |
Merge tag 'v6.6-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/cdns3/cdns3-plat.c')
| -rw-r--r-- | drivers/usb/cdns3/cdns3-plat.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/cdns3/cdns3-plat.c b/drivers/usb/cdns3/cdns3-plat.c index 884e2301237f..2c1aca84f226 100644 --- a/drivers/usb/cdns3/cdns3-plat.c +++ b/drivers/usb/cdns3/cdns3-plat.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/irq.h> #include <linux/kernel.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> @@ -255,9 +256,10 @@ static int cdns3_controller_resume(struct device *dev, pm_message_t msg) cdns3_set_platform_suspend(cdns->dev, false, false); spin_lock_irqsave(&cdns->lock, flags); - cdns_resume(cdns, !PMSG_IS_AUTO(msg)); + cdns_resume(cdns); cdns->in_lpm = false; spin_unlock_irqrestore(&cdns->lock, flags); + cdns_set_active(cdns, !PMSG_IS_AUTO(msg)); if (cdns->wakeup_pending) { cdns->wakeup_pending = false; enable_irq(cdns->wakeup_irq); |