diff --git a/[refs] b/[refs]
index 5479cc18ee56..0bde8650e782 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2b2cbc4b2a2f389442549399a993a8306420baf
+refs/heads/master: e21654a756177bf209d7a3cbe971f16104555f75
diff --git a/trunk/drivers/serial/uartlite.c b/trunk/drivers/serial/uartlite.c
index 92eba893559d..db8607e3d531 100644
--- a/trunk/drivers/serial/uartlite.c
+++ b/trunk/drivers/serial/uartlite.c
@@ -278,8 +278,8 @@ static int ulite_request_port(struct uart_port *port)
 
 static void ulite_config_port(struct uart_port *port, int flags)
 {
-	ulite_request_port(port);
-	port->type = PORT_UARTLITE;
+	if (!ulite_request_port(port))
+		port->type = PORT_UARTLITE;
 }
 
 static int ulite_verify_port(struct uart_port *port, struct serial_struct *ser)