---

yaml --- r: 248704 b: refs/heads/master c: 94d4c89 h: refs/heads/master v: v3
git-mirror · Apr 13, 2011 · 6bc4846 · 6bc4846
1 parent 2ef3cdb
commit 6bc4846
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dab54c9f1e26f47a3313300bc1f4dc0eecb47375
+refs/heads/master: 94d4c8919de3ae9e2e029ed121adfed43803bb5d
diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c
@@ -568,7 +568,7 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
 
 	if (0 > acm_set_control(acm, acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS) &&
 	    (acm->ctrl_caps & USB_CDC_CAP_LINE))
-		goto full_bailout;
+		goto bail_out;
 
 	usb_autopm_put_interface(acm->control);
 
@@ -592,8 +592,6 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
 	mutex_unlock(&open_mutex);
 	return rv;
 
-full_bailout:
-	usb_kill_urb(acm->ctrlurb);
 bail_out:
 	acm->port.count--;
 	mutex_unlock(&acm->mutex);