UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: qcserial: centralize probe exit path 

Creating a common exit path from qcprobe to make it
easier to extend it.

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bjørn Mork 2012-07-15 16:47:37 +02:00 committed by Greg Kroah-Hartman
parent 2cf69930f0
commit d25d5f2882
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/usb/serial/qcserial.c
View File

@ -157,11 +157,10 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
usb_endpoint_is_bulk_out(&intf->endpoint[1].desc)) { usb_endpoint_is_bulk_out(&intf->endpoint[1].desc)) {
dev_dbg(dev, "QDL port found\n"); dev_dbg(dev, "QDL port found\n");
if (serial->interface->num_altsetting == 1) { if (serial->interface->num_altsetting == 1)
retval = 0; /* Success */ retval = 0; /* Success */
break; else
} altsetting = 1;
altsetting = 1;
} }
break; break;
@ -203,8 +202,6 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
default: default:
dev_err(dev, "unknown number of interfaces: %d\n", nintf); dev_err(dev, "unknown number of interfaces: %d\n", nintf);
kfree(data);
retval = -ENODEV;
} }
if (altsetting >= 0) { if (altsetting >= 0) {
@ -214,13 +211,15 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
"Could not set interface, error %d\n", "Could not set interface, error %d\n",
retval); retval);
retval = -ENODEV; retval = -ENODEV;
kfree(data);
} }
} }
/* Set serial->private if not returning -ENODEV */ /* Set serial->private if not returning error */
if (retval != -ENODEV) if (retval == 0)
usb_set_serial_data(serial, data); usb_set_serial_data(serial, data);
else
kfree(data);
return retval; return retval;
} }