USB: serial: f81534: clean up calc_num_ports

Clean up calc_num_ports with respect to handling older chips that lack
config data.

Signed-off-by: Johan Hovold <johan@kernel.org>

diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c
index be106f4e3e57516e55622b3d85780bb4ebbd2fef..365e3acd6c6c3ecb321f8b3defa4d406dac56aa5 100644 (file)
--- a/drivers/usb/serial/f81534.c
+++ b/drivers/usb/serial/f81534.c
@@ -681,12 +681,13 @@ static int f81534_calc_num_ports(struct usb_serial *serial,
                ++num_port;
        }
 
-       if (num_port)
-               return num_port;
+       if (!num_port) {
+               dev_warn(&serial->interface->dev,
+                       "no config found, assuming 4 ports\n");
+               num_port = 4;           /* Nothing found, oldest version IC */
+       }
 
-       dev_warn(&serial->interface->dev, "%s: Read Failed. default 4 ports\n",
-                       __func__);
-       return 4;               /* Nothing found, oldest version IC */
+       return num_port;
 }
 
 static void f81534_set_termios(struct tty_struct *tty,