---

yaml
---
r: 248739
b: refs/heads/master
c: d771d8a
h: refs/heads/master
i:
  248737: 985eeb9
  248735: 5509f75
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4026c4584cd70858d4d3450abfb1cd0714d4f32
+refs/heads/master: d771d8aa37805f5bf75808b12b737f39ee97f5d4

trunk/drivers/usb/class/cdc-wdm.c

@@ -542,6 +542,8 @@ static int wdm_open(struct inode *inode, struct file *file)
 
 	mutex_lock(&desc->lock);
 	if (!desc->count++) {
+		desc->werr = 0;
+		desc->rerr = 0;
 		rv = usb_submit_urb(desc->validity, GFP_KERNEL);
 		if (rv < 0) {
 			desc->count--;
@@ -853,6 +855,18 @@ static int wdm_pre_reset(struct usb_interface *intf)
 	struct wdm_device *desc = usb_get_intfdata(intf);
 
 	mutex_lock(&desc->lock);
+	kill_urbs(desc);
+
+	/*
+	 * we notify everybody using poll of
+	 * an exceptional situation
+	 * must be done before recovery lest a spontaneous
+	 * message from the device is lost
+	 */
+	spin_lock_irq(&desc->iuspin);
+	desc->rerr = -EINTR;
+	spin_unlock_irq(&desc->iuspin);
+	wake_up_all(&desc->wait);
 	return 0;
 }