Browse Source

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

Linus Torvalds 19 years ago
parent
commit
b20fd6508c
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/serial/s3c2410.c

+ 2 - 2
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 s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
 	struct s3c24xx_uart_port *ourport = to_ourport(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 long flags;
 	unsigned int baud, quot;
 	unsigned int baud, quot;
 	unsigned int ulcon;
 	unsigned int ulcon;