diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2006-12-22 10:38:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-22 12:58:48 -0500 |
commit | e21654a756177bf209d7a3cbe971f16104555f75 (patch) | |
tree | 47275c784e126b93c47aaf32e0c42f42459e6dea | |
parent | b2b2cbc4b2a2f389442549399a993a8306420baf (diff) |
[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.c | 4 |
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) | |||
278 | 278 | ||
279 | static void ulite_config_port(struct uart_port *port, int flags) | 279 | static void ulite_config_port(struct uart_port *port, int flags) |
280 | { | 280 | { |
281 | ulite_request_port(port); | 281 | if (!ulite_request_port(port)) |
282 | port->type = PORT_UARTLITE; | 282 | port->type = PORT_UARTLITE; |
283 | } | 283 | } |
284 | 284 | ||
285 | static int ulite_verify_port(struct uart_port *port, struct serial_struct *ser) | 285 | static int ulite_verify_port(struct uart_port *port, struct serial_struct *ser) |