From: Greg Hackmann <ghackmann@google.com>
Date: Fri, 13 Apr 2018 00:29:51 +0000 (-0700)
Subject: Revert "xhci: plat: Register shutdown for xhci_plat"
X-Git-Tag: v4.1.52~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb4b6ba35b937b1ba84d241c9f524d04c257f1a0;p=thirdparty%2Fkernel%2Fstable.git

Revert "xhci: plat: Register shutdown for xhci_plat"

[ Upstream commit c20f53c58261b121d0989e147368803b9773b413 ]

This reverts commit b07c12517f2aed0add8ce18146bb426b14099392

It is incomplete and causes hangs on devices when shutting down.  It
needs a much more "complete" fix in order to work properly.  As that fix
has not been merged, revert this patch for now before it causes any more
problems.

Cc: Greg Hackmann <ghackmann@google.com>
Cc: Adam Wallis <awallis@codeaurora.org>
Cc: Mathias Nyman <mathias.nyman@intel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index e92b9903faa43..23c5bdab988df 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -266,7 +266,6 @@ MODULE_DEVICE_TABLE(of, usb_xhci_of_match);
 static struct platform_driver usb_xhci_driver = {
 	.probe	= xhci_plat_probe,
 	.remove	= xhci_plat_remove,
-	.shutdown	= usb_hcd_platform_shutdown,
 	.driver	= {
 		.name = "xhci-hcd",
 		.pm = DEV_PM_OPS,