Commit fa9ba3ac authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Greg Kroah-Hartman

serial: 8250: fix error handling in of_platform_serial_probe()

clk_disable_unprepare(info->clk) is missed in of_platform_serial_probe(),
while irq_dispose_mapping(port->irq) is missed in of_platform_serial_setup().

Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a73ee843
...@@ -88,7 +88,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev, ...@@ -88,7 +88,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
ret = of_address_to_resource(np, 0, &resource); ret = of_address_to_resource(np, 0, &resource);
if (ret) { if (ret) {
dev_warn(&ofdev->dev, "invalid address\n"); dev_warn(&ofdev->dev, "invalid address\n");
goto out; goto err_unprepare;
} }
spin_lock_init(&port->lock); spin_lock_init(&port->lock);
...@@ -130,16 +130,16 @@ static int of_platform_serial_setup(struct platform_device *ofdev, ...@@ -130,16 +130,16 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n", dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",
prop); prop);
ret = -EINVAL; ret = -EINVAL;
goto out; goto err_dispose;
} }
} }
info->rst = devm_reset_control_get_optional_shared(&ofdev->dev, NULL); info->rst = devm_reset_control_get_optional_shared(&ofdev->dev, NULL);
if (IS_ERR(info->rst)) if (IS_ERR(info->rst))
goto out; goto err_dispose;
ret = reset_control_deassert(info->rst); ret = reset_control_deassert(info->rst);
if (ret) if (ret)
goto out; goto err_dispose;
port->type = type; port->type = type;
port->uartclk = clk; port->uartclk = clk;
...@@ -167,7 +167,9 @@ static int of_platform_serial_setup(struct platform_device *ofdev, ...@@ -167,7 +167,9 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
port->handle_irq = fsl8250_handle_irq; port->handle_irq = fsl8250_handle_irq;
return 0; return 0;
out: err_dispose:
irq_dispose_mapping(port->irq);
err_unprepare:
if (info->clk) if (info->clk)
clk_disable_unprepare(info->clk); clk_disable_unprepare(info->clk);
return ret; return ret;
...@@ -201,7 +203,7 @@ static int of_platform_serial_probe(struct platform_device *ofdev) ...@@ -201,7 +203,7 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
memset(&port8250, 0, sizeof(port8250)); memset(&port8250, 0, sizeof(port8250));
ret = of_platform_serial_setup(ofdev, port_type, &port8250.port, info); ret = of_platform_serial_setup(ofdev, port_type, &port8250.port, info);
if (ret) if (ret)
goto out; goto err_free;
if (port8250.port.fifosize) if (port8250.port.fifosize)
port8250.capabilities = UART_CAP_FIFO; port8250.capabilities = UART_CAP_FIFO;
...@@ -217,15 +219,18 @@ static int of_platform_serial_probe(struct platform_device *ofdev) ...@@ -217,15 +219,18 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
ret = serial8250_register_8250_port(&port8250); ret = serial8250_register_8250_port(&port8250);
if (ret < 0) if (ret < 0)
goto out; goto err_dispose;
info->type = port_type; info->type = port_type;
info->line = ret; info->line = ret;
platform_set_drvdata(ofdev, info); platform_set_drvdata(ofdev, info);
return 0; return 0;
out: err_dispose:
kfree(info);
irq_dispose_mapping(port8250.port.irq); irq_dispose_mapping(port8250.port.irq);
if (info->clk)
clk_disable_unprepare(info->clk);
err_free:
kfree(info);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment