From 6bc4846ba84cc124df4606ae977f96ea93ff92ec Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Tue, 22 Mar 2011 11:12:22 +0100 Subject: [PATCH] --- yaml --- r: 248704 b: refs/heads/master c: 94d4c8919de3ae9e2e029ed121adfed43803bb5d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/cdc-acm.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b11acc3753b4..8f44a49a4636 100644 --- 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 index 2d8d6b838235..f239e3bd6423 100644 --- 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);