diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index a7824a51f86d..5b61419c3810 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -587,7 +587,13 @@ static int wdm_flush(struct file *file, fl_owner_t id)
 {
 	struct wdm_device *desc = file->private_data;
 
-	wait_event(desc->wait, !test_bit(WDM_IN_USE, &desc->flags));
+	pr_err("wdm_flush: file=%px flags=%lx\n", file, desc->flags);
+	while (wait_event_timeout(desc->wait, !test_bit(WDM_IN_USE, &desc->flags) ||
+				  test_bit(WDM_DISCONNECTING, &desc->flags), 30 * HZ) == 0) {
+		pr_err("INFO: task %s:%d blocked for more than 30 seconds.\n",
+		       current->comm, current->pid);
+		pr_err("wdm_flush: file=%px flags=%lx\n", file, desc->flags);
+	}
 
 	/* cannot dereference desc->intf if WDM_DISCONNECTING */
 	if (desc->werr < 0 && !test_bit(WDM_DISCONNECTING, &desc->flags))