[PATCH 09/29] USB: serial: f81534: abort probe on early errors

[Johan Hovold]

We can now abort probe early after an error in calc_num_ports by
returning an errno instead of attempting to continue probing but not
register any ports.

Signed-off-by: Johan Hovold <jo...@kernel.org>
---
 drivers/usb/serial/f81534.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c
index a4b1fea4453e..be106f4e3e57 100644
--- a/drivers/usb/serial/f81534.c
+++ b/drivers/usb/serial/f81534.c
@@ -634,7 +634,7 @@ static int f81534_calc_num_ports(struct usb_serial *serial,
        if (status) {
                dev_err(&serial->interface->dev, "%s: find idx failed: %d\n",
                                __func__, status);
-               return 0;
+               return status;
        }
 
        /*
@@ -650,7 +650,7 @@ static int f81534_calc_num_ports(struct usb_serial *serial,
                        dev_err(&serial->interface->dev,
                                        "%s: get custom data failed: %d\n",
                                        __func__, status);
-                       return 0;
+                       return status;
                }
 
                dev_dbg(&serial->interface->dev,
@@ -666,7 +666,7 @@ static int f81534_calc_num_ports(struct usb_serial *serial,
                        dev_err(&serial->interface->dev,
                                        "%s: read failed: %d\n", __func__,
                                        status);
-                       return 0;
+                       return status;
                }
 
                dev_dbg(&serial->interface->dev, "%s: read default config\n",
-- 
2.12.0

--
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