[PATCH] serial/uartlite: Only enable port if request_port succeeded
authorPeter Korsgaard <jacmet@sunsite.dk>
Fri, 22 Dec 2006 15:38:40 +0000 (16:38 +0100)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 22 Dec 2006 17:58:48 +0000 (09:58 -0800)
The uartlite driver used to always enable the port even if request_port
failed causing havoc. This patch fixes it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/serial/uartlite.c

index 92eba893559d003189e680bdf7d17f2990300111..db8607e3d5318013a13b0fa94eee7707c6270e7b 100644 (file)
@@ -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)