[PATCH usb-next 2/6] USB: qcserial: centralize probe exit path

[Bjørn Mork]

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

Signed-off-by: Bjørn Mork <bj...@mork.no>
---
 drivers/usb/serial/qcserial.c |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index 74e0b13..7556f34 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -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)) {
                        dev_dbg(dev, "QDL port found\n");
 
-                       if (serial->interface->num_altsetting == 1) {
+                       if (serial->interface->num_altsetting == 1)
                                retval = 0; /* Success */
-                               break;
-                       }
-                       altsetting = 1;
+                       else
+                               altsetting = 1;
                }
                break;
 
@@ -203,8 +202,6 @@ static int qcprobe(struct usb_serial *serial, const struct 
usb_device_id *id)
 
        default:
                dev_err(dev, "unknown number of interfaces: %d\n", nintf);
-               kfree(data);
-               retval = -ENODEV;
        }
 
        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",
                                retval);
                        retval = -ENODEV;
-                       kfree(data);
                }
        }
 
-       /* Set serial->private if not returning -ENODEV */
-       if (retval != -ENODEV)
+       /* Set serial->private if not returning error */
+       if (retval == 0)
                usb_set_serial_data(serial, data);
+       else
+               kfree(data);
+
        return retval;
 }
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html