From: Johan Hovold <johan@kernel.org>
Date: Thu, 16 Mar 2017 16:13:57 +0000 (+0100)
Subject: USB: serial: f81534: clean up calc_num_ports
X-Git-Tag: v4.14-rc1~993^2~9^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e07240a12101af8481a90283da766905caf35f8;p=platform%2Fkernel%2Flinux-rpi.git

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 be106f4..365e3ac 100644
--- 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,