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

git-mirror · Sep 29, 2005 · b20fd65 · b20fd65
2 parents b38708f + f04da5d
commit b20fd65
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 clk *clk;
+	struct s3c24xx_uart_clksrc *clksrc = NULL;
+	struct clk *clk = NULL;
 	unsigned long flags;
 	unsigned int baud, quot;
 	unsigned int ulcon;