Commit 672c4e18 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

usb: cdc-acm: bugfix release()

Bugfixes to the usb_driver_release_interface() usage;

  (a) make sure releasing *either* interface first will release
      the other, instead of insisting it be the control interface;

  (b) remove the recently-added self-deadlock.

(The "fix disconnect bug in cdc-acm" patch was incomplete and incorrect.)

Plus a small "sparse" fix:  rename a local variable so it doesn't
shadow a function parameter.
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1f1ba11b
...@@ -1108,9 +1108,11 @@ static int acm_probe (struct usb_interface *intf, ...@@ -1108,9 +1108,11 @@ static int acm_probe (struct usb_interface *intf,
rcv->instance = acm; rcv->instance = acm;
} }
for (i = 0; i < num_rx_buf; i++) { for (i = 0; i < num_rx_buf; i++) {
struct acm_rb *buf = &(acm->rb[i]); struct acm_rb *rb = &(acm->rb[i]);
if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) { rb->base = usb_buffer_alloc(acm->dev, readsize,
GFP_KERNEL, &rb->dma);
if (!rb->base) {
dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n"); dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n");
goto alloc_fail7; goto alloc_fail7;
} }
...@@ -1172,6 +1174,7 @@ static int acm_probe (struct usb_interface *intf, ...@@ -1172,6 +1174,7 @@ static int acm_probe (struct usb_interface *intf,
acm_set_line(acm, &acm->line); acm_set_line(acm, &acm->line);
usb_driver_claim_interface(&acm_driver, data_interface, acm); usb_driver_claim_interface(&acm_driver, data_interface, acm);
usb_set_intfdata(data_interface, acm);
usb_get_intf(control_interface); usb_get_intf(control_interface);
tty_register_device(acm_tty_driver, minor, &control_interface->dev); tty_register_device(acm_tty_driver, minor, &control_interface->dev);
...@@ -1221,11 +1224,11 @@ static void acm_disconnect(struct usb_interface *intf) ...@@ -1221,11 +1224,11 @@ static void acm_disconnect(struct usb_interface *intf)
struct acm *acm = usb_get_intfdata(intf); struct acm *acm = usb_get_intfdata(intf);
struct usb_device *usb_dev = interface_to_usbdev(intf); struct usb_device *usb_dev = interface_to_usbdev(intf);
mutex_lock(&open_mutex); /* sibling interface is already cleaning up */
if (!acm || !acm->dev) { if (!acm)
mutex_unlock(&open_mutex);
return; return;
}
mutex_lock(&open_mutex);
if (acm->country_codes){ if (acm->country_codes){
device_remove_file(&acm->control->dev, device_remove_file(&acm->control->dev,
&dev_attr_wCountryCodes); &dev_attr_wCountryCodes);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment