summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2011-03-22 11:12:22 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-13 16:18:33 -0700
commit94d4c8919de3ae9e2e029ed121adfed43803bb5d (patch)
tree7d2f63fb259b8a38c3f059ad265715c2435f66d2
parentdab54c9f1e26f47a3313300bc1f4dc0eecb47375 (diff)
downloadop-kernel-dev-94d4c8919de3ae9e2e029ed121adfed43803bb5d.zip
op-kernel-dev-94d4c8919de3ae9e2e029ed121adfed43803bb5d.tar.gz
USB: cdc-acm: clean up open error handling
No need to kill ctrl urb on errors as this is done later during close. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/class/cdc-acm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 2d8d6b8..f239e3b 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/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 @@ out:
mutex_unlock(&open_mutex);
return rv;
-full_bailout:
- usb_kill_urb(acm->ctrlurb);
bail_out:
acm->port.count--;
mutex_unlock(&acm->mutex);
OpenPOWER on IntegriCloud