This reverts commit 319f7a85b3c4e34ac2fe083eb146fe129a556317.
The reverted commit uses disable_delayed_work_sync, which was introduced
by commit 86898fa6b8cd ("workqueue: Implement disable/enable for
(delayed) work items") in v6.10. The function is therefore unavailable
in 6.6.y, causing configurations that enable CONFIG_FSL_USB2_OTG to fail
to build.
The upstream commit is unaffected; only its incompatible stable backport
is being reverted.
Fixes: 319f7a85b3c4 ("usb: phy: fsl-usb: Fix use-after-free in delayed work
during device removal")
Link: https://lore.kernel.org/stable/[email protected]/
Signed-off-by: Ralf Lici <[email protected]>
---
drivers/usb/phy/phy-fsl-usb.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index 552899fa985e..79617bb0a70e 100644
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -987,7 +987,6 @@ static void fsl_otg_remove(struct platform_device *pdev)
{
struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev);
- disable_delayed_work_sync(&fsl_otg_dev->otg_event);
usb_remove_phy(&fsl_otg_dev->phy);
free_irq(fsl_otg_dev->irq, fsl_otg_dev);
base-commit: a4a971135a2ff64382ae4235b3ae60503bb1036a
--
2.55.0
