|
@@ -1684,7 +1684,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
|
|
|
return -ENODEV;
|
|
|
|
|
|
if (port->mapbase != 0)
|
|
|
- return 0;
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
/* setup info for port */
|
|
|
port->dev = &platdev->dev;
|
|
@@ -1738,22 +1738,25 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
|
|
|
ourport->dma = devm_kzalloc(port->dev,
|
|
|
sizeof(*ourport->dma),
|
|
|
GFP_KERNEL);
|
|
|
- if (!ourport->dma)
|
|
|
- return -ENOMEM;
|
|
|
+ if (!ourport->dma) {
|
|
|
+ ret = -ENOMEM;
|
|
|
+ goto err;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
ourport->clk = clk_get(&platdev->dev, "uart");
|
|
|
if (IS_ERR(ourport->clk)) {
|
|
|
pr_err("%s: Controller clock not found\n",
|
|
|
dev_name(&platdev->dev));
|
|
|
- return PTR_ERR(ourport->clk);
|
|
|
+ ret = PTR_ERR(ourport->clk);
|
|
|
+ goto err;
|
|
|
}
|
|
|
|
|
|
ret = clk_prepare_enable(ourport->clk);
|
|
|
if (ret) {
|
|
|
pr_err("uart: clock failed to prepare+enable: %d\n", ret);
|
|
|
clk_put(ourport->clk);
|
|
|
- return ret;
|
|
|
+ goto err;
|
|
|
}
|
|
|
|
|
|
/* Keep all interrupts masked and cleared */
|
|
@@ -1769,7 +1772,12 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
|
|
|
|
|
|
/* reset the fifos (and setup the uart) */
|
|
|
s3c24xx_serial_resetport(port, cfg);
|
|
|
+
|
|
|
return 0;
|
|
|
+
|
|
|
+err:
|
|
|
+ port->mapbase = 0;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
/* Device driver serial port probe */
|