summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2006-12-22 16:38:40 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-22 09:58:48 -0800
commite21654a756177bf209d7a3cbe971f16104555f75 (patch)
tree47275c784e126b93c47aaf32e0c42f42459e6dea
parentb2b2cbc4b2a2f389442549399a993a8306420baf (diff)
downloadlinux-next-e21654a756177bf209d7a3cbe971f16104555f75.tar.gz
[PATCH] serial/uartlite: Only enable port if request_port succeeded
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>
-rw-r--r--drivers/serial/uartlite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index 92eba893559d..db8607e3d531 100644
--- a/drivers/serial/uartlite.c
+++ b/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)