diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 3580afd72baa..522b209d86be 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1947,7 +1947,7 @@ int xhci_sec_event_ring_cleanup(struct usb_device *udev, unsigned int intr_num)
 {
 	struct usb_hcd *hcd = bus_to_hcd(udev->bus);
 
-	if (udev->state == USB_STATE_NOTATTACHED || !HCD_RH_RUNNING(hcd))
+	if (!HCD_RH_RUNNING(hcd))
 		return 0;
 
 	return sec_event_ring_cleanup(hcd_to_xhci(hcd), intr_num);
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 1176b001e3dd..8b9a39eddf40 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -5390,7 +5390,7 @@ int xhci_stop_endpoint(struct usb_device *udev, struct usb_host_endpoint *ep)
 	unsigned long flags;
 	int ret = 0;
 
-	if (udev->state == USB_STATE_NOTATTACHED || !HCD_RH_RUNNING(hcd))
+	if (!HCD_RH_RUNNING(hcd))
 		return 0;
 
 	cmd = xhci_alloc_command(xhci, true, GFP_NOIO);