Merge master.kernel.org:/home/rmk/linux-2.6-serial

b20fd650 · Linus Torvalds · b38708fc · f04da5de · b20fd650
Commit b20fd650 authored Sep 29, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/serial/s3c2410.c drivers/serial/s3c2410.c +2 -2

No files found.
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -753,8 +753,8 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
 {
 	struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
 	struct s3c24xx_uart_port *ourport = to_ourport(port);
-	struct s3c24xx_uart_clksrc *clksrc;
+	struct s3c24xx_uart_clksrc *clksrc = NULL;
-	struct clk *clk;
+	struct clk *clk = NULL;
 	unsigned long flags;
 	unsigned int baud, quot;
 	unsigned int ulcon;